diff --git a/lib/wrench.js b/lib/wrench.js
index 0139319..0b9b697 100644
--- a/lib/wrench.js
+++ b/lib/wrench.js
@@ -411,13 +411,13 @@ exports.LineReader.prototype = {
             if(this.currentPosition === -1) return false;
         }
 
-        if(this.buffer.indexOf("\n") > -1) return true;
+        if(this.buffer.indexOf("\n") > -1 || this.buffer.length !== 0) return true;
         return false;
     },
 
     getNextLine: function() {
         var lineEnd = this.buffer.indexOf("\n"),
-            result = this.buffer.substring(0, lineEnd);
+            result = this.buffer.substring(0, lineEnd ? lineEnd : this.buffer.length);
 
         this.buffer = this.buffer.substring(result.length + 1, this.buffer.length);
         return result;