Finishing touches.

1 files changed, 6 insertions, 11 deletions

diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 078ac3385d..c8ad7c9c27 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -259,17 +259,12 @@ duplicate_node_check(NodeStr) ->
                 false -> ok
             end;
         {error, EpmdReason} ->
-            Tip = case EpmdReason of
-                      address ->
-                          io_lib:format("(Unable to connect to epmd on "
-                                        "host ~p.)", [NodeHost]);
-                      nxdomain ->
-                          io_lib:format("(Can't resolve host ~p.)",
-                                        [NodeHost]);
-                      _ -> []
-                  end,
-            terminate("unexpected epmd error: ~p ~s~n",
-                      [EpmdReason, Tip])
+            terminate("epmd error for host ~p: ~p (~s)~n",
+                      [NodeHost, EpmdReason,
+                       case EpmdReason of
+                           address -> "unable to establish tcp connection";
+                           _       -> inet:format_error(EpmdReason)
+                       end])
     end.
 
 terminate(Fmt, Args) ->