diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 6c5a4f7..3d741da 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -230,7 +230,8 @@ cwd_of_pid (int pid)
 				if (chdir (cwd_file) == 0)
 				{
 					working_dir = g_get_current_dir ();
-					(void) chdir (cwd);
+					if (chdir (cwd) < 0)
+						g_warning ("Could not change working directory.");
 				}
 				g_free (cwd);
 			}
diff --git a/src/terminal.c b/src/terminal.c
index 81aab2d..401af42 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -563,7 +563,8 @@ main (int argc, char **argv)
 	 */
 	home_dir = g_get_home_dir ();
 	if (home_dir == NULL || chdir (home_dir) < 0)
-		(void) chdir ("/");
+		if (chdir ("/") < 0)
+			g_warning ("Could not change working directory.");
 
 	options = terminal_options_parse (working_directory,
 	                                  NULL,