diff --git a/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java
index 33fa15b8f7a..f334d4fcac2 100644
--- a/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java
+++ b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java
@@ -359,17 +359,23 @@ public class TelnetProtocol extends Thread implements TelnetCodes {
 			// Tell the command shell that we have terminated
 			shell.terminated();
 			try {
-				inputChannel.close();
+				if(inputChannel != null) {
+					inputChannel.close();
+				}
 			} catch (IOException ioe) {
 				/* ignore */
 			}
 			try {
-				serverOutputStream.close();
+				if(serverOutputStream != null) {
+					serverOutputStream.close();
+				}
 			} catch (IOException ioe) {
 				/* ignore */
 			}
 			try {
-				clientOutputStream.close();
+				if(clientOutputStream != null) {
+					clientOutputStream.close();
+				}
 			} catch (IOException ioe) {
 				/* ignore */
 			}