diff --git a/ChangeLog b/ChangeLog
index 7f2c44078c..9b803bb1a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May  8 12:09:12 CEST 2009 Guido Günther <agx@sigxcpu.org>
+
+	* src/vbox/vbox_tmpl.c (vboxUninitialize): fix crash when init fails
+	  early (i.e. due to vbox not being installed)
+
 Fri May  8 11:10:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/qemu_driver.c: Make name & UUID uniqueness checking in
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 72971723f6..6507a69782 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -291,7 +291,8 @@ static int vboxExtractVersion(virConnectPtr conn, vboxGlobalData *data) {
 }
 
 static void vboxUninitialize(vboxGlobalData *data) {
-    data->pFuncs->pfnComUninitialize();
+    if (data->pFuncs)
+        data->pFuncs->pfnComUninitialize();
     VBoxCGlueTerm();
 
     if (!data)