diff --git a/psftp.c b/psftp.c
index 5394c1fb..aa397181 100644
--- a/psftp.c
+++ b/psftp.c
@@ -1128,12 +1128,12 @@ int sftp_cmd_cd(struct sftp_command *cmd)
 
     if (cmd->nwords < 2)
 	dir = dupstr(homedir);
-    else
+    else {
 	dir = canonify(cmd->words[1]);
-
-    if (!dir) {
-	printf("%s: canonify: %s\n", dir, fxp_error());
-	return 0;
+        if (!dir) {
+            printf("%s: canonify: %s\n", cmd->words[1], fxp_error());
+            return 0;
+        }
     }
 
     req = fxp_opendir_send(dir);
@@ -1417,7 +1417,7 @@ int sftp_cmd_mkdir(struct sftp_command *cmd)
     for (i = 1; i < cmd->nwords; i++) {
 	dir = canonify(cmd->words[i]);
 	if (!dir) {
-	    printf("%s: canonify: %s\n", dir, fxp_error());
+	    printf("%s: canonify: %s\n", cmd->words[i], fxp_error());
 	    return 0;
 	}