--- rxvt-unicode/src/init.C	2007/10/08 15:36:13	1.215
+++ rxvt-unicode/src/init.C	2007/10/09 13:36:10	1.217
@@ -355,15 +355,10 @@
     if (!strcmp (argv[r_argc], "-e"))
       break;
 
-  r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
-
-  for (i = 0; i < r_argc; i++)
-    r_argv[i] = (const char *)argv[i];
-
-  r_argv[i] = NULL;
-
   if (r_argc == argc)
     cmd_argv = NULL;
+  else if (!argv[r_argc + 1])
+    rxvt_fatal ("-e requires an argument\n");
   else
     {
       cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
@@ -374,6 +369,13 @@
       cmd_argv[i] = NULL;
     }
 
+  r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
+
+  for (i = 0; i < r_argc; i++)
+    r_argv[i] = (const char *)argv[i];
+
+  r_argv[i] = NULL;
+
   rs[Rs_name] = rxvt_basename (argv[0]);
 
   /*
@@ -386,7 +388,10 @@
   get_options (r_argc, r_argv);
 
   if (!(display = displays.get (rs[Rs_display_name])))
-    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    {
+      free (r_argv);
+      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    }
 
   // using a local pointer decreases code size a lot
   xa = display->xa;