better error handling

1 files changed, 8 insertions, 5 deletions

diff --git a/src/rabbit_command_assembler.erl b/src/rabbit_command_assembler.erl
index ba3fbed5..f8d3260e 100644
--- a/src/rabbit_command_assembler.erl
+++ b/src/rabbit_command_assembler.erl
@@ -92,11 +92,14 @@ analyze_frame(_Type, _Body, _Protocol) ->
 init(Protocol) -> {ok, {method, Protocol}}.
 
 process({method, MethodName, FieldsBin}, {method, Protocol}) ->
-    Method = Protocol:decode_method_fields(MethodName, FieldsBin),
-    case Protocol:method_has_content(MethodName) of
-        true  -> {ClassId, _MethodId} = Protocol:method_id(MethodName),
-                 {ok, {content_header, Method, ClassId, Protocol}};
-        false -> {ok, Method, {method, Protocol}}
+    try
+        Method = Protocol:decode_method_fields(MethodName, FieldsBin),
+        case Protocol:method_has_content(MethodName) of
+            true  -> {ClassId, _MethodId} = Protocol:method_id(MethodName),
+                     {ok, {content_header, Method, ClassId, Protocol}};
+            false -> {ok, Method, {method, Protocol}}
+        end
+    catch exit:#amqp_error{} = Reason -> {error, Reason}
     end;
 process(_Frame, {method, _Protocol}) ->
     unexpected_frame("expected method frame, "