diff --git a/lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod b/lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod
index 520ef2e7085c50b5cb3bac66268f309adc525ee5..facee2721a6950c65b0a92606b406ef0b8e477ca 100644
--- a/lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod
+++ b/lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod
@@ -109,6 +109,7 @@ protected array(int) read_identifier(Stdio.Buffer data)
       ({"universal","application","context","private"})[cls], const, tag, len);
 
   data = [object(Stdio.Buffer)]data->read_buffer(len);
+  data->set_error_mode(1);
 
   program(.Types.Object) p = types[ .Types.make_combined_tag(cls, tag) ];
 
@@ -230,7 +231,7 @@ mapping(int:program(.Types.Object)) universal_types =
 				mapping(int:program(.Types.Object))|void types)
 {
   types = types ? universal_types+types : universal_types;
-  Stdio.Buffer buf = Stdio.Buffer(data);
+  Stdio.Buffer buf = Stdio.Buffer(data)->set_error_mode(1);
   .Types.Object ret = der_decode(buf, types);
   if( sizeof(buf) ) return 0;
   return ret;
diff --git a/lib/modules/Standards.pmod/ASN1.pmod/testsuite.in b/lib/modules/Standards.pmod/ASN1.pmod/testsuite.in
index 76e6a100f2795a313f46ea4f6768ee7cf1d64a42..bf363493db499dd720d7b763fde9373d4f88b941 100644
--- a/lib/modules/Standards.pmod/ASN1.pmod/testsuite.in
+++ b/lib/modules/Standards.pmod/ASN1.pmod/testsuite.in
@@ -3,6 +3,10 @@ START_MARKER
 test_do( add_constant("Types", Standards.ASN1.Types); )
 
 test_eval_error(Standards.ASN1.Decode.simple_der_decode(""))
+test_eval_error(Standards.ASN1.Decode.secure_der_decode(""))
+
+test_eval_error(Standards.ASN1.Decode.simple_der_decode(String.hex2string("a2184515521e4c5d26f05590543c696ca2bd04b7754a18107d7f62744fbcb3a52ee80de3dca53339c3f6b2196afe3c540adfeb92686029f2")))
+test_eval_error(Standards.ASN1.Decode.secure_der_decode(String.hex2string("a2184515521e4c5d26f05590543c696ca2bd04b7754a18107d7f62744fbcb3a52ee80de3dca53339c3f6b2196afe3c540adfeb92686029f2")))
 
 define(test_decode,[[
   test_eq(sprintf("%O",Standards.ASN1.Decode.simple_der_decode(String.hex2string($1-" ")))-"Standards.ASN1.",$2)