diff --git a/console-server.c b/console-server.c
index d71c63a..83f7e50 100644
--- a/console-server.c
+++ b/console-server.c
@@ -982,17 +982,21 @@
 		}
 	}
 	console->rb = ringbuffer_init(buffer_size);
+	if (!console->rb) {
+		rc = -1;
+		goto out_config_fini;
+	}
 
 	if (set_socket_info(console, config, console_id)) {
 		rc = -1;
-		goto out_config_fini;
+		goto out_ringbuffer_fini;
 	}
 
 	uart_routing_init(config);
 
 	rc = tty_init(console, config, config_tty_kname);
 	if (rc) {
-		goto out_config_fini;
+		goto out_ringbuffer_fini;
 	}
 
 	dbus_init(console, config);
@@ -1005,6 +1009,9 @@
 
 	tty_fini(console);
 
+out_ringbuffer_fini:
+	ringbuffer_fini(console->rb);
+
 out_config_fini:
 	config_fini(config);