diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 196376b1..872fa326 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -140,6 +140,8 @@ cmd_command_prompt_callback(void *data, const char *s)
 			}
 		}
 
+		if (buf == NULL)
+			return (0);
 		buf[len] = '\0';
 		s = buf;
 	}
diff --git a/layout-set.c b/layout-set.c
index ae99f6ff..4433d0cf 100644
--- a/layout-set.c
+++ b/layout-set.c
@@ -122,10 +122,9 @@ layout_set_even_h(struct window *w)
 		return;
 
 	/* How many can we fit? */
-	if (w->sx / n < PANE_MINIMUM + 1) {
+	if (w->sx / n < PANE_MINIMUM + 1)
 		width = PANE_MINIMUM + 1;
-		n = UINT_MAX;
-	} else
+	else
 		width = w->sx / n;
 
 	/* Free the old root and construct a new. */
@@ -177,10 +176,9 @@ layout_set_even_v(struct window *w)
 		return;
 
 	/* How many can we fit? */
-	if (w->sy / n < PANE_MINIMUM + 1) {
+	if (w->sy / n < PANE_MINIMUM + 1)
 		height = PANE_MINIMUM + 1;
-		n = UINT_MAX;
-	} else
+	else
 		height = w->sy / n;
 
 	/* Free the old root and construct a new. */