diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index 6f9a756984..0821dc62cb 100644
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -1406,7 +1406,8 @@ suggest_trie_walk(
 	    tword[sp->ts_twordlen] = NUL;
 
 	    if (sp->ts_prefixdepth <= PFD_NOTSPECIAL
-					&& (sp->ts_flags & TSF_PREFIXOK) == 0)
+					&& (sp->ts_flags & TSF_PREFIXOK) == 0
+					&& pbyts != NULL)
 	    {
 		// There was a prefix before the word.  Check that the prefix
 		// can be used with this word.
diff --git a/src/version.c b/src/version.c
index 53bb772a90..4c3ab9639c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1104,
 /**/
     1103,
 /**/