diff --git a/ChangeLog b/ChangeLog
index 2b8348897efbea717338e2a6ca66b7918fed1f8c..5e4dec03aafd5cf854aac0c05ef8787521a22018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-16  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* files.c (get_real_dir_from_tilde): Fix segfault when dealing
+	with directory names that begin with "~", but that aren't users'
+	home directories. (DLR, found by Justin Fletcher)
+
 2007-04-11  Mike Frysinger  <vapier@gentoo.org>
 
 	* doc/syntax/asm.nanorc, doc/syntax/c.nanorc,
diff --git a/src/files.c b/src/files.c
index 90060277bf119d5b869adfcd7780b4e81ad7709d..68d760e63945138e203229c888586d2f0d9e311d 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1979,7 +1979,7 @@ char *real_dir_from_tilde(const char *buf)
 
     if (buf[0] == '~') {
 	size_t i;
-	const char *tilde_dir;
+	const char *tilde_dir = NULL;
 
 	/* Figure out how much of the str we need to compare. */
 	for (i = 1; buf[i] != '/' && buf[i] != '\0'; i++)
@@ -1997,7 +1997,8 @@ char *real_dir_from_tilde(const char *buf)
 	    } while (userdata != NULL &&
 		strncmp(userdata->pw_name, buf + 1, i - 1) != 0);
 	    endpwent();
-	    tilde_dir = userdata->pw_dir;
+	    if (userdata != NULL)
+		tilde_dir = userdata->pw_dir;
 	}
 
 	if (tilde_dir != NULL) {