diff --git a/src/gmhc_server.erl b/src/gmhc_server.erl
index 605551d..db7cbf1 100644
--- a/src/gmhc_server.erl
+++ b/src/gmhc_server.erl
@@ -102,13 +102,21 @@ handle_cast({from_pool, #{via := Connector,
                               #{candidate := Cand0}}},
                           #st{workers = Workers} = S) ->
     Cand = maps:put(via, Connector, decode_candidate_hash(Cand0)),
-    %% ?LOG_DEBUG("Got new candidate; will mine it: ~p", [Cand]),
+    ?LOG_DEBUG("Got new candidate; will mine it: ~p", [Cand]),
+    %%
+    %% We could check whether we have already received the candidate ...
     %% For now, stop all workers, restart with new candidate
-    Workers1 = stop_workers(Workers),
-    {Workers2, Cand1} = assign_nonces(Workers1, Cand),
-    #st{candidate = Cand2} = S1 = maybe_request_nonces(S#st{candidate = Cand1}),
-    NewWorkers = [spawn_worker(W, Cand2) || W <- Workers2],
-    {noreply, S1#st{workers = NewWorkers}};
+    try
+        Workers1 = stop_workers(Workers),
+        {Workers2, Cand1} = assign_nonces(Workers1, Cand),
+        #st{candidate = Cand2} = S1 = maybe_request_nonces(S#st{candidate = Cand1}),
+        NewWorkers = [spawn_worker(W, Cand2) || W <- Workers2],
+        {noreply, S1#st{workers = NewWorkers}}
+    catch
+       Cat:Err:St ->
+           ?LOG_ERROR("CAUGHT ~p:~p / ~p", [Cat, Err, St]),
+	   {noreply, S}
+    end;
 handle_cast({disconnected, Id}, #st{connected = Conn} = S) ->
     ?LOG_DEBUG("disconnected: ~p", [Id]),
     Conn1 = maps:remove(Id, Conn),
@@ -122,9 +130,7 @@ handle_cast(_Msg, S) ->
     {noreply, S}.
 
 handle_info({'DOWN', MRef, process, Pid, Reason}, #st{ workers = Workers
-                                                     , connected = Connected
-                                                     , working = Working} = S)
-  when ?CONNECTED(S), Working ->
+                                                     , connected = Connected} = S) ->
     %% ?LOG_DEBUG("DOWN from ~p: ~p", [Pid, Reason]),
     case lists:keyfind(Pid, #worker.pid, Workers) of
         #worker{mref = MRef} = W ->
@@ -302,7 +308,9 @@ stop_workers_for_seq(Seq, Workers) ->
     [stop_worker(W) || #worker{cand = #{seq := Seq1}} = W <- Workers,
                        Seq1 =:= Seq].
 
-stop_worker(#worker{pid = Pid, mref = MRef} = W) when is_pid(Pid) ->
+stop_worker(#worker{pid = Pid} = W) when is_pid(Pid) ->
+    MRef = erlang:monitor(process, Pid),
+    ?LOG_DEBUG("Will stop worker ~p (MRef = ~p)", [Pid, MRef]),
     exit(Pid, kill),
     receive
         {'EXIT', Pid, _} -> ok;