Merge branch 'maint'

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/ssl/src/dtls_udp_listener.erl b/lib/ssl/src/dtls_udp_listener.erl
index c9e04767aa..0608c6bd2b 100644
--- a/lib/ssl/src/dtls_udp_listener.erl
+++ b/lib/ssl/src/dtls_udp_listener.erl
@@ -84,7 +84,7 @@ init([Port, EmOpts, InetOptions, DTLSOptions]) ->
 		    listener = Socket,
                     close = false}}
     catch _:_ ->
-	    {error, closed}
+	    {stop, {shutdown, {error, closed}}}
     end.
 handle_call({accept, _}, _, #state{close = true} = State) ->
     {reply, {error, closed}, State};
@@ -153,15 +153,18 @@ handle_info({udp_error, Socket, Error}, #state{listener = Socket} = State) ->
 
 handle_info({'DOWN', _, process, Pid, _}, #state{clients = Clients,
 						 dtls_processes = Processes0,
+                                                 dtls_msq_queues = MsgQueues0,
                                                  close = ListenClosed} = State) ->
     Client = kv_get(Pid, Processes0),
     Processes = kv_delete(Pid, Processes0),
+    MsgQueues = kv_delete(Client, MsgQueues0),
     case ListenClosed andalso kv_empty(Processes) of
         true ->
             {stop, normal, State};
         false ->
             {noreply, State#state{clients = set_delete(Client, Clients),
-                                  dtls_processes = Processes}}
+                                  dtls_processes = Processes,
+                                  dtls_msq_queues = MsgQueues}}
     end.
 
 terminate(_Reason, _State) ->