1 files changed, 3 insertions, 6 deletions
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index a33d477e5..b721ca1e7 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -55,12 +55,10 @@
 	 transform_options/1, opt_type/1]).
 
 -include("logger.hrl").
-
 -include("xmpp.hrl").
-
 -include("ejabberd_commands.hrl").
-
 -include_lib("public_key/include/public_key.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(PKIXEXPLICIT, 'OTP-PUB-KEY').
 
@@ -94,10 +92,9 @@ start_link() ->
 
 route(Packet) ->
     try do_route(Packet)
-    catch E:R ->
-            St = erlang:get_stacktrace(),
+    catch ?EX_RULE(E, R, St) ->
             ?ERROR_MSG("failed to route packet:~n~s~nReason = ~p",
-                       [xmpp:pp(Packet), {E, {R, St}}])
+                       [xmpp:pp(Packet), {E, {R, ?EX_STACK(St)}}])
     end.
 
 clean_temporarily_blocked_table() ->