diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index e6d9dcf092..4d22d427e4 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -667,8 +667,9 @@ static int insert_execute(VimState *state, int key)
       // there is nothing to add, CTRL-L works like CTRL-P then.
       if (s->c == Ctrl_L
           && (!CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode)
-              || (int)STRLEN(compl_shown_match->cp_str)
-              > curwin->w_cursor.col - compl_col)) {
+              || (compl_shown_match->cp_str != NULL
+                  && (int)STRLEN(compl_shown_match->cp_str)
+                  > curwin->w_cursor.col - compl_col))) {
         ins_compl_addfrommatch();
         return 1;  // continue
       }
@@ -3005,7 +3006,6 @@ bool ins_compl_active(void)
 // Get complete information
 void get_complete_info(list_T *what_list, dict_T *retdict)
 {
-  int ret = OK;
 #define CI_WHAT_MODE            0x01
 #define CI_WHAT_PUM_VISIBLE     0x02
 #define CI_WHAT_ITEMS           0x04
@@ -3037,7 +3037,8 @@ void get_complete_info(list_T *what_list, dict_T *retdict)
     }
   }
 
-  if (ret == OK && (what_flag & CI_WHAT_MODE)) {
+  int ret = OK;
+  if (what_flag & CI_WHAT_MODE) {
     ret = tv_dict_add_str(retdict, S_LEN("mode"),
                           (char *)ins_compl_mode());
   }
diff --git a/src/nvim/window.c b/src/nvim/window.c
index ad38a34dac..e135d7436d 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -2575,15 +2575,12 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
     free_tabpage(tp);
 }
 
-/*
- * Free the memory used for a window.
- * Returns a pointer to the window that got the freed up space.
- */
-static win_T *
-win_free_mem (
+// Free the memory used for a window.
+// Returns a pointer to the window that got the freed up space.
+static win_T *win_free_mem(
     win_T *win,
-    int *dirp,              /* set to 'v' or 'h' for direction if 'ea' */
-    tabpage_T *tp                /* tab page "win" is in, NULL for current */
+    int *dirp,              // set to 'v' or 'h' for direction if 'ea'
+    tabpage_T *tp           // tab page "win" is in, NULL for current
 )
 {
   frame_T     *frp;
@@ -2595,6 +2592,7 @@ win_free_mem (
     wp = winframe_remove(win, dirp, tp);
     xfree(frp);
   } else {
+    *dirp = 'h';  // Dummy value.
     if (win_valid(prevwin) && prevwin != win) {
       wp = prevwin;
     } else {
@@ -2603,10 +2601,11 @@ win_free_mem (
   }
   win_free(win, tp);
 
-  /* When deleting the current window of another tab page select a new
-   * current window. */
-  if (tp != NULL && win == tp->tp_curwin)
+  // When deleting the current window of another tab page select a new
+  // current window.
+  if (tp != NULL && win == tp->tp_curwin) {
     tp->tp_curwin = wp;
+  }
 
   return wp;
 }