1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index a8e6ebde16..85b31f3669 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -93,11 +93,16 @@ call(ChannelPid, Msg, TimeOute) ->
     catch 
  	exit:{noproc, _} ->
  	    {error, closed};
+	exit:{normal, _} ->
+	    {error, closed};
+	exit:{shutdown, _} ->
+	    {error, closed};
+	exit:{{shutdown, _}, _} ->
+	    {error, closed};
  	exit:{timeout, _} ->
  	    {error, timeout}
     end.
 
-
 cast(ChannelPid, Msg) ->
     gen_server:cast(ChannelPid, Msg).
 
@@ -256,7 +261,7 @@ handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
 	    adjust_window(Msg),
 	    {noreply, State#state{channel_state = ChannelState}, Timeout};
 	{stop, ChannelId, ChannelState} ->
-	    ssh_connection:close(ConnectionManager, ChannelId),
+	    catch ssh_connection:close(ConnectionManager, ChannelId),
 	    {stop, normal, State#state{close_sent = true,
 				       channel_state = ChannelState}}
     end;