Merged 20047 into default

1 files changed, 14 insertions, 11 deletions

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 5d7fde90ef..07d55d04e6 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -111,20 +111,23 @@ init(ProxyPid, [ReaderPid, WriterPid, Username, VHost]) ->
         consumer_mapping        = dict:new()}.
 
 handle_message({method, Method, Content}, State) ->
-    case (catch handle_method(Method, Content, State)) of
-        {reply, Reply, NewState} ->
-            ok = rabbit_writer:send_command(NewState#ch.writer_pid, Reply),
-            NewState;
-        {noreply, NewState} ->
-            NewState;
-        stop ->
-            exit(normal);
-        {'EXIT', {amqp, Error, Explanation, none}} ->
+    try
+        case handle_method(Method, Content, State) of
+            {reply, Reply, NewState} ->
+                ok = rabbit_writer:send_command(NewState#ch.writer_pid, Reply),
+                NewState;
+            {noreply, NewState} ->
+                NewState;
+            stop ->
+                exit(normal)
+        end
+    catch
+        exit:{amqp, Error, Explanation, none} ->
             terminate({amqp, Error, Explanation,
                        rabbit_misc:method_record_type(Method)},
                       State);
-        {'EXIT', Reason} ->
-            terminate(Reason, State)
+        _:Reason ->
+            terminate({Reason, erlang:get_stacktrace()}, State)
     end;
 
 handle_message(terminate, State) ->