diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index 5a682ae535..31fb1c4b64 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -111,6 +111,11 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
                     _log.debug("New message received: [" + msg + "]");
                 }
 
+                if(msg.equals("")) {
+                    _log.debug("Ignoring newline");
+                    continue;
+                }
+
                 tok = new StringTokenizer(msg, " ");
                 if (tok.countTokens() < 2) {
                     // This is not a correct message, for sure
diff --git a/history.txt b/history.txt
index 389ac73c62..b60dffdc4b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.138 2005/02/06 17:14:46 jrandom Exp $
+$Id: history.txt,v 1.139 2005/02/07 05:04:23 jrandom Exp $
+
+2005-02-09  duck
+    * Allow an unneeded newline in the SAM client connection without
+      disconnecting.
 
 2005-02-07  jrandom
     * Fixed a race in the streaming lib's delayed flush algorithm (thanks anon!)