diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 7aba0260ccd..3fc0ca82288 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-06  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* runtime/main.c (store_exe_path): Don't crash if argv0 is NULL.
+
 2008-12-05  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libfortran/38291
diff --git a/libgfortran/runtime/main.c b/libgfortran/runtime/main.c
index 71b481a7deb..947b3985238 100644
--- a/libgfortran/runtime/main.c
+++ b/libgfortran/runtime/main.c
@@ -111,7 +111,8 @@ store_exe_path (const char * argv0)
 
   char buf[PATH_MAX], *cwd, *path;
 
-  if (argv0[0] == '/')
+  /* On the simulator argv is not set.  */
+  if (argv0 == NULL || argv0[0] == '/')
     {
       exe_path = argv0;
       please_free_exe_path_when_done = 0;