diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
index 2c46b5cb71..eb576507e2 100644
--- a/lib/reline/line_editor.rb
+++ b/lib/reline/line_editor.rb
@@ -1605,7 +1605,7 @@ def input_key(key)
     else
       @just_cursor_moving = false
     end
-    if @is_multiline and @auto_indent_proc and not simplified_rendering?
+    if @is_multiline and @auto_indent_proc and not simplified_rendering? and @line
       process_auto_indent
     end
   end
@@ -1849,7 +1849,7 @@ def byte_pointer=(val)
   def whole_lines
     index = @previous_line_index || @line_index
     temp_lines = @buffer_of_lines.dup
-    temp_lines[index] = @line || ""
+    temp_lines[index] = @line
     temp_lines
   end