diff --git a/src/map.c b/src/map.c
index ff117dc6da..8d60eee25e 100644
--- a/src/map.c
+++ b/src/map.c
@@ -84,10 +84,10 @@ map_free(mapblock_T **mpp)
     vim_free(mp->m_str);
     vim_free(mp->m_orig_str);
     *mpp = mp->m_next;
-    vim_free(mp);
 #ifdef FEAT_EVAL
     reset_last_used_map(mp);
 #endif
+    vim_free(mp);
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 3846e39ad8..53f1619f94 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4150,
 /**/
     4149,
 /**/