diff --git a/src/ar_gossip.erl b/src/ar_gossip.erl
index 6c37ef55a..763e53e8e 100644
--- a/src/ar_gossip.erl
+++ b/src/ar_gossip.erl
@@ -23,6 +23,7 @@ init(MaxDelayMS) when is_integer(MaxDelayMS) ->
 add_peers(S, []) -> S;
 add_peers(S, [Peer|Peers]) when self() == Peer -> add_peers(S, Peers);
 add_peers(S, [Peer|Peers]) ->
+	ar:report_console([{adding_peer, Peer}, {node, self()}]),
 	case lists:member(Peer, S#gs_state.peers) of
 		false -> add_peers(S#gs_state { peers = [Peer|S#gs_state.peers] }, Peers);
 		true -> add_peers(S, Peers)
diff --git a/src/ar_util.erl b/src/ar_util.erl
index 4b53a7604..e9f7ac5db 100644
--- a/src/ar_util.erl
+++ b/src/ar_util.erl
@@ -135,6 +135,7 @@ dehexify([X,Y|T], Acc) ->
 	dehexify(T, [V | Acc]).
 
 %% @doc Parse a string representing a remote host into our internal format.
+parse_peer("") -> throw(empty_peer_string);
 parse_peer(BitStr) when is_bitstring(BitStr) ->
 	parse_peer(bitstring_to_list(BitStr));
 parse_peer(Str) when is_list(Str) ->