Catch all types of exceptions, preserve the stack trace in the event that we have a non-AMQP error.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 4dd150a26f..751d412200 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -713,11 +713,12 @@ handle_method0(MethodName, FieldsBin,
     try
         handle_method0(Protocol:decode_method_fields(MethodName, FieldsBin),
                        State)
-    catch exit:Reason ->
+    catch Type:Reason ->
             CompleteReason = case Reason of
                                  #amqp_error{method = none} ->
                                      Reason#amqp_error{method = MethodName};
-                                 OtherReason -> OtherReason
+                                 OtherReason -> {Type, OtherReason,
+                                                 erlang:get_stacktrace()}
                              end,
             case ?IS_RUNNING(State) of
                 true  -> send_exception(State, 0, CompleteReason);