refactor

1 files changed, 3 insertions, 3 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 11638ee981..850c79f42f 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -169,8 +169,8 @@ action(stop, Node, Args, _Opts, Inform) ->
     case {Res, Args} of
         {ok, [PidFile]} -> wait_for_process_death(
                              read_pid_file(PidFile, false));
-        {_, []}         -> ok;
-        _               -> exit({badarg, Args})
+        {ok, [_, _| _]} -> exit({badarg, Args});
+        _               -> ok
     end,
     Res;
 
@@ -398,7 +398,7 @@ read_pid_file(PidFile, Wait) ->
             S = string:strip(binary_to_list(Bin), right, $\n),
             try list_to_integer(S)
             catch error:badarg ->
-                    exit({error, {garbage_in_pid_file, S}})
+                    exit({error, {garbage_in_pid_file, PidFile}})
             end,
             S;
         {{error, enoent}, true} ->