2 files changed, 10 insertions, 4 deletions
diff --git a/src/org/connectbot/transport/Local.java b/src/org/connectbot/transport/Local.java
index dcdf40d..dbf959b 100644
--- a/src/org/connectbot/transport/Local.java
+++ b/src/org/connectbot/transport/Local.java
@@ -95,10 +95,14 @@ public class Local extends AbsTransport {
 	@Override
 	public void close() {
 		try {
-			os.close();
-			is.close();
-			os = null;
-			is = null;
+			if (os != null) {
+				os.close();
+				os = null;
+			}
+			if (is != null) {
+				is.close();
+				is = null;
+			}
 		} catch (IOException e) {
 			Log.e(TAG, "Couldn't close shell", e);
 		}
diff --git a/src/org/connectbot/transport/Telnet.java b/src/org/connectbot/transport/Telnet.java
index 72e1b2b..597ac1b 100644
--- a/src/org/connectbot/transport/Telnet.java
+++ b/src/org/connectbot/transport/Telnet.java
@@ -132,9 +132,11 @@ public class Telnet extends AbsTransport {
 
 	@Override
 	public void close() {
+		connected = false;
 		if (socket != null)
 			try {
 				socket.close();
+				socket = null;
 			} catch (IOException e) {
 				Log.d(TAG, "Error closing telnet socket.", e);
 			}