diff --git a/src/com/sheepit/client/standalone/GuiText.java b/src/com/sheepit/client/standalone/GuiText.java
index 87974c8..2abf35f 100644
--- a/src/com/sheepit/client/standalone/GuiText.java
+++ b/src/com/sheepit/client/standalone/GuiText.java
@@ -88,6 +88,8 @@ public class GuiText implements Gui {
 			client.run();
 			client.stop();
 		}
+		// stop if there is no client or client has been stopped
+		this.stop();
 	}
 	
 	@Override public void stop() {
diff --git a/src/com/sheepit/client/standalone/GuiTextOneLine.java b/src/com/sheepit/client/standalone/GuiTextOneLine.java
index 0268bd5..7e6947f 100644
--- a/src/com/sheepit/client/standalone/GuiTextOneLine.java
+++ b/src/com/sheepit/client/standalone/GuiTextOneLine.java
@@ -100,6 +100,8 @@ public class GuiTextOneLine implements Gui {
 			client.run();
 			client.stop();
 		}
+		// stop if there is no client or client has been stopped
+		this.stop();
 	}
 	
 	@Override public void stop() {