diff --git a/tmux.c b/tmux.c
index c91620a7..e1707ab7 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.10 2009/06/25 06:40:25 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.11 2009/06/25 06:54:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -387,8 +387,11 @@ main(int argc, char **argv)
 	    &global_options, "default-command", "exec %s -l", shell);
 
 	if (getcwd(cwd, sizeof cwd) == NULL) {
-		log_warn("getcwd");
-		exit(1);
+		pw = getpwuid(getuid());
+		if (pw->pw_dir != NULL && *pw->pw_dir != '\0')
+			strlcpy(cwd, pw->pw_dir, sizeof cwd);
+		else
+			strlcpy(cwd, "/", sizeof cwd);
 	}
 	options_set_string(&global_options, "default-path", "%s", cwd);