diff --git a/svr-chansession.c b/svr-chansession.c
index 9ecda79..02cb035 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
@@ -1033,9 +1033,14 @@ static void execchild(const void *user_data) {
 
 	/* change directory */
 	if (chdir(ses.authstate.pw_dir) < 0) {
-		dropbear_exit("Error changing directory");
+		int e = errno;
+		if (chdir("/") < 0) {
+			dropbear_exit("chdir(\"/\") failed");
+		}
+		fprintf(stderr, "Failed chdir '%s': %s\n", ses.authstate.pw_dir, strerror(e));
 	}
 
+
 #if DROPBEAR_X11FWD
 	/* set up X11 forwarding if enabled */
 	x11setauth(chansess);