diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 97fc3a3ca3..b45e7002f7 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -102,12 +102,15 @@ char_u *parse_shape_opt(int what)
     }
     while (*modep != NUL) {
       colonp = vim_strchr(modep, ':');
-      if (colonp == NULL)
-        return (char_u *)N_("E545: Missing colon");
-      if (colonp == modep)
-        return (char_u *)N_("E546: Illegal mode");
       commap = vim_strchr(modep, ',');
 
+      if (colonp == NULL || (commap != NULL && commap < colonp)) {
+        return (char_u *)N_("E545: Missing colon");
+      }
+      if (colonp == modep) {
+        return (char_u *)N_("E546: Illegal mode");
+      }
+
       // Repeat for all modes before the colon.
       // For the 'a' mode, we loop to handle all the modes.
       all_idx = -1;
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
index 3c1b0050b5..a15d15213a 100644
--- a/src/nvim/testdir/test_options.vim
+++ b/src/nvim/testdir/test_options.vim
@@ -209,7 +209,14 @@ func Test_set_errors()
   call assert_fails('set statusline=%{', 'E540:')
   call assert_fails('set statusline=' . repeat("%p", 81), 'E541:')
   call assert_fails('set statusline=%(', 'E542:')
-  call assert_fails('set guicursor=x', 'E545:')
+  if has('cursorshape')
+    " This invalid value for 'guicursor' used to cause Vim to crash.
+    call assert_fails('set guicursor=i-ci,r-cr:h', 'E545:')
+    call assert_fails('set guicursor=i-ci', 'E545:')
+    call assert_fails('set guicursor=x', 'E545:')
+    call assert_fails('set guicursor=r-cr:horx', 'E548:')
+    call assert_fails('set guicursor=r-cr:hor0', 'E549:')
+  endif
   call assert_fails('set backupext=~ patchmode=~', 'E589:')
   call assert_fails('set winminheight=10 winheight=9', 'E591:')
   call assert_fails('set winminwidth=10 winwidth=9', 'E592:')