diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java
index b4f50a8951b..5daa1c68551 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java
@@ -168,8 +168,12 @@ public class SshHostShell extends AbstractHostShell implements IHostShell {
 	}
 
 	public void exit() {
-		fShellWriter.stopThread();
-		fChannel.disconnect();
+		if (fShellWriter!=null) {
+			fShellWriter.stopThread();
+		}
+		if (fChannel!=null) {
+			fChannel.disconnect();
+		}
 	}
 
 }