diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index fdd549e475..267a4a58c5 100644
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -3719,17 +3719,22 @@ cleanup_suggestions(
     suggest_T   *stp = &SUG(*gap, 0);
     int		i;
 
-    // Sort the list.
-    qsort(gap->ga_data, (size_t)gap->ga_len, sizeof(suggest_T), sug_compare);
-
-    // Truncate the list to the number of suggestions that will be displayed.
-    if (gap->ga_len > keep)
+    if (gap->ga_len > 0)
     {
-	for (i = keep; i < gap->ga_len; ++i)
-	    vim_free(stp[i].st_word);
-	gap->ga_len = keep;
-	if (keep >= 1)
-	    return stp[keep - 1].st_score;
+	// Sort the list.
+	qsort(gap->ga_data, (size_t)gap->ga_len, sizeof(suggest_T),
+								  sug_compare);
+
+	// Truncate the list to the number of suggestions that will be
+	// displayed.
+	if (gap->ga_len > keep)
+	{
+	    for (i = keep; i < gap->ga_len; ++i)
+		vim_free(stp[i].st_word);
+	    gap->ga_len = keep;
+	    if (keep >= 1)
+		return stp[keep - 1].st_score;
+	}
     }
     return maxscore;
 }
diff --git a/src/version.c b/src/version.c
index 7d2f12ede5..a25685c0ff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    387,
 /**/
     386,
 /**/