diff --git a/console-server.c b/console-server.c
index aec7a35..596e227 100644
--- a/console-server.c
+++ b/console-server.c
@@ -1007,7 +1007,10 @@
 		goto out_ringbuffer_fini;
 	}
 
-	dbus_init(console, config);
+	rc = dbus_init(console, config);
+	if (rc) {
+		goto out_tty_fini;
+	}
 
 	handlers_init(console, config);
 
@@ -1015,6 +1018,7 @@
 
 	handlers_fini(console);
 
+out_tty_fini:
 	tty_fini(console);
 
 out_ringbuffer_fini: