diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index feb17bc..afd4238 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2321,7 +2321,6 @@
     static int
 nfa_regbranch(void)
 {
-    int		ch;
     int		old_post_pos;
 
     old_post_pos = (int)(post_ptr - post_start);
@@ -2330,11 +2329,13 @@
     if (nfa_regconcat() == FAIL)
 	return FAIL;
 
-    ch = peekchr();
     /* Try next concats */
-    while (ch == Magic('&'))
+    while (peekchr() == Magic('&'))
     {
 	skipchr();
+	/* if concat is empty do emit a node */
+	if (old_post_pos == (int)(post_ptr - post_start))
+	    EMIT(NFA_EMPTY);
 	EMIT(NFA_NOPEN);
 	EMIT(NFA_PREV_ATOM_NO_WIDTH);
 	old_post_pos = (int)(post_ptr - post_start);
@@ -2344,7 +2345,6 @@
 	if (old_post_pos == (int)(post_ptr - post_start))
 	    EMIT(NFA_EMPTY);
 	EMIT(NFA_CONCAT);
-	ch = peekchr();
     }
 
     /* if a branch is empty, emit one node for it */
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index d13e654..cb65fbf 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -721,3 +721,11 @@
   enew!
   let &encoding = save_enc
 endfunc
+
+" This was causing E874.  Also causes an invalid read?
+func Test_look_behind()
+  new
+  call setline(1, '0\|\&\n\@<=') 
+  call search(getline("."))
+  bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index 224118a..096d21c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1397,
+/**/
     1396,
 /**/
     1395,