diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 8755f05..dd5e0a8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10361,6 +10361,7 @@
 	    {
 		curwin->w_cursor.lnum = eap->line1++;
 		curwin->w_cursor.col = 0;
+		check_cursor_moved(curwin);
 	    }
 
 	    exec_normal_cmd(
diff --git a/src/move.c b/src/move.c
index 3d6d2ec..f058b73 100644
--- a/src/move.c
+++ b/src/move.c
@@ -177,11 +177,9 @@
     int		save_so = p_so;
 #endif
 
-    if (!screen_valid(TRUE))
-	return;
-
-    /* If the window height is zero just use the cursor line. */
-    if (curwin->w_height == 0)
+    /* If there is no valid screen and when the window height is zero just use
+     * the cursor line. */
+    if (!screen_valid(TRUE) || curwin->w_height == 0)
     {
 	curwin->w_topline = curwin->w_cursor.lnum;
 	curwin->w_botline = curwin->w_topline;
@@ -2592,6 +2590,7 @@
     n = (curwin->w_p_scr <= curwin->w_height) ?
 				    curwin->w_p_scr : curwin->w_height;
 
+    update_topline();
     validate_botline();
     room = curwin->w_empty_rows;
 #ifdef FEAT_DIFF
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 9d59138..2b003c7 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -197,3 +197,14 @@
   " Only expect "vim" to appear in v:progname.
   call assert_match('vim\c', v:progname)
 endfunc
+
+func Test_silent_ex_mode()
+  if !has('unix') || has('gui_running')
+    " can't get output of Vim.
+    return
+  endif
+
+  " This caused an ml_get error.
+  let out = system(GetVimCommand() . '-u NONE -es -c''set verbose=1|h|exe "%norm\<c-y>\<c-d>"'' -c cq')
+  call assert_notmatch('E315:', out)
+endfunc
diff --git a/src/version.c b/src/version.c
index 79c97f9..c114d8f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    515,
+/**/
     514,
 /**/
     513,