diff --git a/lib/coffee-script/rewriter.js b/lib/coffee-script/rewriter.js
index ebe668ba..8f40ce35 100644
--- a/lib/coffee-script/rewriter.js
+++ b/lib/coffee-script/rewriter.js
@@ -194,7 +194,7 @@
         };
         endImplicitCall = function() {
           stack.pop();
-          tokens.splice(i, 0, generate('CALL_END', ')'));
+          tokens.splice(i, 0, generate('CALL_END', ')', ['', 'end of input', token[2]]));
           return i += 1;
         };
         startImplicitObject = function(j, startsLine) {
diff --git a/src/rewriter.coffee b/src/rewriter.coffee
index d20ea612..a15414e9 100644
--- a/src/rewriter.coffee
+++ b/src/rewriter.coffee
@@ -157,7 +157,7 @@ class exports.Rewriter
 
       endImplicitCall = ->
         stack.pop()
-        tokens.splice i, 0, generate 'CALL_END', ')'
+        tokens.splice i, 0, generate 'CALL_END', ')', ['', 'end of input', token[2]]
         i += 1
 
       startImplicitObject = (j, startsLine = yes) ->
diff --git a/test/error_messages.coffee b/test/error_messages.coffee
index 2aa9e7f1..29b3a68b 100644
--- a/test/error_messages.coffee
+++ b/test/error_messages.coffee
@@ -111,6 +111,11 @@ test "#1096: unexpected generated tokens", ->
     a:
       ^
   '''
+  assertErrorFormat 'a +', '''
+    [stdin]:1:4: error: unexpected end of input
+    a +
+       ^
+  '''
   # Unexpected implicit object
   assertErrorFormat '''
     for i in [1]: