Handle the most common parsing error nicely.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 9d47a78f16..6e57b1baa3 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -372,10 +372,14 @@ action(report, Node, _Args, _Opts, Inform) ->
 
 action(eval, Node, [Expr], _Opts, _Inform) ->
     {ok, Scanned, _} = erl_scan:string(Expr),
-    {ok, Parsed} = erl_parse:parse_exprs(Scanned),
-    {value, Value, _Bindings} = rpc_call(Node, erl_eval, exprs, [Parsed, []]),
-    io:format("~p~n", [Value]),
-    ok.
+    case erl_parse:parse_exprs(Scanned) of
+        {ok, Parsed} ->
+            {value, Value, _} = rpc_call(Node, erl_eval, exprs, [Parsed, []]),
+            io:format("~p~n", [Value]),
+            ok;
+        {error, {1, erl_parse, Err}} ->
+            {error, Err}
+    end.
 
 %%----------------------------------------------------------------------------