diff --git a/src/shell/shell_batch.cpp b/src/shell/shell_batch.cpp
index 499a8756..cec7f45d 100644
--- a/src/shell/shell_batch.cpp
+++ b/src/shell/shell_batch.cpp
@@ -63,8 +63,8 @@ emptyline:
 				*cmd_write++=c;
 		}
 	} while (c!='\n' && n);
-	*cmd_write++=0;
-	if (!n) {
+	*cmd_write=0;
+	if (!n && cmd_write==temp) {
 		delete this;
 		return false;	
 	}