2 files changed, 3 insertions, 6 deletions
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index ba0cebd0ed..b3de566382 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -33,11 +33,11 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/strutil.h>
+#include <epan/show_exception.h>
 
 #include <string.h>
 #include "packet-ber.h"
 #include "packet-tcap.h"
-#include "packet-frame.h"
 #include <epan/tcap-persistentdata.h>
 
 #define PNAME  "Transaction Capabilities Application Part"
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index ae28bd5839..c32c6ae20f 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -94,11 +94,8 @@ if (!next_tvb)
 TRY {
 %(DEFAULT_BODY)s
 }
-CATCH(BoundsError) {
-  RETHROW;
-}
-CATCH(ReportedBoundsError) {
-  show_reported_bounds_error(tvb, actx->pinfo, tree);
+CATCH_NONFATAL_ERRORS {
+  show_exception(tvb, actx->pinfo, tree, EXCEPT_CODE, GET_MESSAGE);
 }
 ENDTRY;