diff --git a/src/if_ruby.c b/src/if_ruby.c
index 7fab211..a018dcd 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -885,7 +885,7 @@
 	    error_print(state);
 	    break;
 	}
-	if (was_curbuf != curbuf)
+	if (was_curbuf != curbuf || i > curbuf->b_ml.ml_line_count)
 	    break;
 	line = rb_lastline_get();
 	if (!NIL_P(line))