2 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index 0b45816..3c7206e 100644
--- a/main.c
+++ b/main.c
@@ -1243,7 +1243,7 @@ static const char *repeat(Vis *vis, const char *keys, const Arg *arg) {
 static const char *cursors_new(Vis *vis, const char *keys, const Arg *arg) {
 	View *view = vis_view(vis);
 	for (int count = vis_count_get_default(vis, 1); count > 0; count--) {
-		Cursor *cursor;
+		Cursor *cursor = NULL;
 		switch (arg->i) {
 		case -1:
 		case +1:
diff --git a/sam.c b/sam.c
index 618db3c..11a6c02 100644
--- a/sam.c
+++ b/sam.c
@@ -1162,7 +1162,7 @@ static bool cmd_cd(Vis *vis, Win *win, Command *cmd, const char *argv[], Cursor
 	const char *dir = argv[1];
 	if (!dir)
 		dir = getenv("HOME");
-	return chdir(dir) == 0;
+	return dir && chdir(dir) == 0;
 }
 
 #include "vis-cmds.c"