4 files changed, 38 insertions, 34 deletions
diff --git a/lib/asn1/test/ber_decode_error.erl b/lib/asn1/test/ber_decode_error.erl
index c0840e02d7..c45d130ff4 100644
--- a/lib/asn1/test/ber_decode_error.erl
+++ b/lib/asn1/test/ber_decode_error.erl
@@ -26,48 +26,41 @@ run([]) ->
     {ok,B}  = 'Constructed':encode('S3', {'S3',17}),
     [T,L|V] = binary_to_list(B),
     Bytes = list_to_binary([T,L+3|V] ++ [2,1,3]),
-    case 'Constructed':decode('S3', Bytes) of
-	{error,{asn1,{unexpected,_}}} -> ok
-    end,
+    {unexpected,_} = dec_error('S3', Bytes),
 
     %% Unexpected bytes must be accepted if there is an extensionmark
     {ok,{'S3ext',17}} = 'Constructed':decode('S3ext', Bytes),
 
     %% Truncated tag.
-    {error,{asn1,{invalid_tag,_}}} =
-	(catch 'Constructed':decode('I', <<31,255,255>>)),
+    {invalid_tag,_} = dec_error('I', <<31,255,255>>),
 
     %% Overlong tag.
-    {error,{asn1,{invalid_tag,_}}} =
-	(catch 'Constructed':decode('I', <<31,255,255,255,127>>)),
+    {invalid_tag,_} = dec_error('I', <<31,255,255,255,127>>),
 
     %% Invalid length.
-    {error,{asn1,{invalid_length,_}}} =
-	(catch 'Constructed':decode('I', <<8,255>>)),
+    {invalid_length,_} = dec_error('I', <<8,255>>),
 
     %% Other errors.
-    {error,{asn1,{invalid_value,_}}} =
-	(catch 'Constructed':decode('I', <<>>)),
+    {invalid_value,_} = dec_error('I', <<>>),
 
-    {error,{asn1,{invalid_value,_}}} =
-	(catch 'Constructed':decode('I', <<8,7>>)),
+    {invalid_value,_} = dec_error('I', <<8,7>>),
 
     %% Short indefinite length. Make sure that the decoder doesn't look
     %% beyond the end of binary when looking for a 0,0 terminator.
-    {error,{asn1,{invalid_length,_}}} =
-	(catch 'Constructed':decode('S', sub(<<8,16#80,0,0>>, 3))),
-    {error,{asn1,{invalid_length,_}}} =
-	(catch 'Constructed':decode('S', sub(<<8,16#80,0,0>>, 2))),
-    {error,{asn1,{invalid_length,_}}} =
-	(catch 'Constructed':decode('S', sub(<<40,16#80,1,1,255,0,0>>, 6))),
-    {error,{asn1,{invalid_length,_}}} =
-	(catch 'Constructed':decode('S', sub(<<40,16#80,1,1,255,0,0>>, 5))),
+    {invalid_length,_} = dec_error('S', sub(<<8,16#80,0,0>>, 3)),
+    {invalid_length,_} = dec_error('S', sub(<<8,16#80,0,0>>, 2)),
+    {invalid_length,_} = dec_error('S', sub(<<40,16#80,1,1,255,0,0>>, 6)),
+    {invalid_length,_} = dec_error('S', sub(<<40,16#80,1,1,255,0,0>>, 5)),
 
     %% A primitive must not be encoded with an indefinite length.
-    {error,{asn1,{invalid_length,_}}} =
-	(catch 'Constructed':decode('OS', <<4,128,4,3,97,98,99,0,0>>)),
+    {invalid_length,_} = dec_error('OS', <<4,128,4,3,97,98,99,0,0>>),
     ok.
 
+dec_error(T, Bin) ->
+    {error,{asn1,{Reason,Stk}}} = 'Constructed':decode(T, Bin),
+    [{_,_,_,_}|_] = Stk,
+    Reason.
+
 sub(Bin, Bytes) ->
     <<B:Bytes/binary,_/binary>> = Bin,
     B.
diff --git a/lib/asn1/test/testChoPrim.erl b/lib/asn1/test/testChoPrim.erl
index 573c482f2b..61b6ab2d05 100644
--- a/lib/asn1/test/testChoPrim.erl
+++ b/lib/asn1/test/testChoPrim.erl
@@ -31,10 +31,10 @@ bool(Rules) ->
     roundtrip('ChoCon', {int2,233}),
     case Rules of
 	ber ->
-	    {error,{asn1,{invalid_choice_type,wrong}}} =
-		(catch 'ChoPrim':encode('ChoCon', {wrong,233})),
-	    {error,{asn1,{invalid_choice_tag,_WrongTag}}} =
-		(catch 'ChoPrim':decode('ChoCon', <<131,2,0,233>>));
+	    {error,{asn1,{{invalid_choice_type,wrong},[_|_]}}} =
+                 (catch 'ChoPrim':encode('ChoCon', {wrong,233})),
+	    {error,{asn1,{{invalid_choice_tag,_WrongTag},[_|_]}}} =
+                 (catch 'ChoPrim':decode('ChoCon', <<131,2,0,233>>));
 	per ->
 	    ok;
 	uper ->
diff --git a/lib/asn1/test/testInfObjectClass.erl b/lib/asn1/test/testInfObjectClass.erl
index 560986fac9..540407fa51 100644
--- a/lib/asn1/test/testInfObjectClass.erl
+++ b/lib/asn1/test/testInfObjectClass.erl
@@ -33,19 +33,29 @@ main(Rule) ->
     roundtrip('Seq', Val),
     
     %% OTP-5783
-    {error,{asn1,{'Type not compatible with table constraint',
-		  {component,'ArgumentType'},
-		  {value,_},_}}} = 'InfClass':encode('Seq', {'Seq',12,13,1}),
+    {'Type not compatible with table constraint',
+     {component,'ArgumentType'},
+     {value,_},_} = enc_error('Seq', {'Seq',12,13,1}),
     Bytes2 = case Rule of
 		 ber ->
 		     <<48,9,2,1,12,2,1,11,2,1,1>>;
 		 _ ->
 		     <<1,12,1,11,1,1>>
 	     end,
-    {error,{asn1,{'Type not compatible with table constraint',
-		  {{component,_},
-		   {value,_B},_}}}} = 'InfClass':decode('Seq', Bytes2),
+    {'Type not compatible with table constraint',
+     {{component,_},
+      {value,_B},_}} = dec_error('Seq', Bytes2),
     ok.
 
 roundtrip(T, V) ->
     asn1_test_lib:roundtrip('InfClass', T, V).
+
+enc_error(T, V) ->
+    {error,{asn1,{Reason,Stk}}} = 'InfClass':encode(T, V),
+    [{_,_,_,_}|_] = Stk,
+    Reason.
+
+dec_error(T, Bin) ->
+    {error,{asn1,{Reason,Stk}}} = 'InfClass':decode(T, Bin),
+    [{_,_,_,_}|_] = Stk,
+    Reason.
diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
index 14546ff41c..b2933dfabc 100644
--- a/lib/asn1/test/testPrim.erl
+++ b/lib/asn1/test/testPrim.erl
@@ -195,7 +195,8 @@ roundtrip(Type, Value, ExpectedValue) ->
 enc_error(T, V) ->
     case get(no_ok_wrapper) of
 	false ->
-	    {error,{asn1,Reason}} = 'Prim':encode(T, V),
+	    {error,{asn1,{Reason,Stk}}} = 'Prim':encode(T, V),
+            [{_,_,_,_}|_] = Stk,
             Reason;
 	true ->
 	    try 'Prim':encode(T, V) of