diff --git a/ChangeLog b/ChangeLog
index e53b0fdc1..0211f6106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-07  Thomas Thurman  <tthurman@gnome.org>
+
+        * src/core/main.c (main): g_free is a no-op on nulls; there is no
+	need to test.
+
 2008-01-06  Thomas Thurman  <tthurman@gnome.org>
 
         * src/core/display.c: Function commenting marathon; more to come.
diff --git a/src/core/main.c b/src/core/main.c
index 8319fba7c..e250a0dd5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -402,12 +402,9 @@ main (int argc, char **argv)
   /* Free memory possibly allocated by the argument parsing which are
    * no longer needed.
    */
-  if (meta_args.save_file)
-    g_free (meta_args.save_file);
-  if (meta_args.display_name)
-    g_free (meta_args.display_name);
-  if (meta_args.client_id)
-    g_free (meta_args.client_id);
+  g_free (meta_args.save_file);
+  g_free (meta_args.display_name);
+  g_free (meta_args.client_id);
   
   if (!meta_display_open ())
     meta_exit (META_EXIT_ERROR);