diff --git a/ChangeLog b/ChangeLog
index d15a0d870f..9cecb0fd11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec  5 11:24:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/virsh.c: quit if initial conection attempt fails
+
 Wed Dec  5 10:29:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/Makefile.am: Fix VPATH build for remote_generate_stubs.pl
diff --git a/src/virsh.c b/src/virsh.c
index 207a0ddc72..c6fc5deefd 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -4529,8 +4529,10 @@ vshInit(vshControl * ctl)
      * vshConnectionUsability, except ones which don't need a connection
      * such as "help".
      */
-    if (!ctl->conn)
+    if (!ctl->conn) {
         vshError(ctl, FALSE, _("failed to connect to the hypervisor"));
+        return FALSE;
+    }
 
     return TRUE;
 }