diff --git a/ChangeLog b/ChangeLog
index 68865df352..f222ff21f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  7 09:16:05 CEST 2009 Guido Günther <agx@sigxcpu.org>
+
+	* src/lxc_controller.c (main): don't crash when called without
+	arguments
+
 Wed May  6 16:55:02 GMT 2009 Mark McLoughlin <markmc@redhat.com>
 
 	* src/qemu_driver.c: fix handling of <hostdev managed='yes'>
diff --git a/src/lxc_controller.c b/src/lxc_controller.c
index 3f9add2cc1..e0fb05d038 100644
--- a/src/lxc_controller.c
+++ b/src/lxc_controller.c
@@ -745,7 +745,8 @@ int main(int argc, char *argv[])
 
 
 cleanup:
-    virFileDeletePid(LXC_STATE_DIR, def->name);
+    if (def)
+        virFileDeletePid(LXC_STATE_DIR, def->name);
     lxcControllerCleanupInterfaces(nveths, veths);
     unlink(sockpath);
     VIR_FREE(sockpath);