diff --git a/cmd-new-session.c b/cmd-new-session.c
index 7687398e..b3bf3c74 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -133,7 +133,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
 				    strerror(errno));
 				return (CMD_RETURN_ERROR);
 			}
-		} else if (cp != NULL)
+		} else
 			free(cp);
 		cwd = fd;
 	} else if (c != NULL && c->session == NULL)
diff --git a/cmd-new-window.c b/cmd-new-window.c
index 9cead449..893fe6e2 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -107,7 +107,7 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
 				    strerror(errno));
 				return (CMD_RETURN_ERROR);
 			}
-		} else if (cp != NULL)
+		} else
 			free(cp);
 		cwd = fd;
 	} else if (cmdq->client != NULL && cmdq->client->session == NULL)
diff --git a/cmd-split-window.c b/cmd-split-window.c
index 4e85a0f3..f397113f 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -101,7 +101,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
 				    strerror(errno));
 				return (CMD_RETURN_ERROR);
 			}
-		} else if (cp != NULL)
+		} else
 			free(cp);
 		cwd = fd;
 	} else if (cmdq->client != NULL && cmdq->client->session == NULL)
diff --git a/tty.c b/tty.c
index 5d23ee82..3d6f29ca 100644
--- a/tty.c
+++ b/tty.c
@@ -338,10 +338,8 @@ tty_free(struct tty *tty)
 	tty_close(tty);
 
 	free(tty->ccolour);
-	if (tty->path != NULL)
-		free(tty->path);
-	if (tty->termname != NULL)
-		free(tty->termname);
+	free(tty->path);
+	free(tty->termname);
 }
 
 void