diff --git a/src/main/java/com/github/koraktor/steamcondenser/servers/SourceServer.java b/src/main/java/com/github/koraktor/steamcondenser/servers/SourceServer.java
index 8f336a9..5770410 100644
--- a/src/main/java/com/github/koraktor/steamcondenser/servers/SourceServer.java
+++ b/src/main/java/com/github/koraktor/steamcondenser/servers/SourceServer.java
@@ -181,12 +181,15 @@ public String rconExec(String command)
         do {
             responsePacket = this.rconSocket.getReply();
 
-            if (responsePacket == null ||
+            if ((response.size() == 0 && responsePacket == null) ||
                     responsePacket instanceof RCONAuthResponse) {
                 this.rconAuthenticated = false;
                 throw new RCONNoAuthException();
             }
 
+            if(responsePacket == null)
+                break;
+
             if (!isMulti && ((RCONExecResponsePacket) responsePacket).getResponse().length() > 0) {
                 isMulti = true;
                 this.rconSocket.send(new RCONTerminator(this.rconRequestId));