diff --git a/src/normal.c b/src/normal.c
index 3d5b6d8..b7f3dd4 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -7552,6 +7552,7 @@
 #endif
 #ifdef FEAT_FOLDING
     if (cap->oap->op_type == OP_NOP
+	    && pos != NULL
 	    && (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos))
 	    && (fdo_flags & FDO_MARK)
 	    && old_KeyTyped)
diff --git a/src/version.c b/src/version.c
index b60be3c..cd838d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    783,
+/**/
     782,
 /**/
     781,