diff --git a/cagebreak.c b/cagebreak.c
index f1ae6a7..0738b67 100644
--- a/cagebreak.c
+++ b/cagebreak.c
@@ -272,6 +272,7 @@ main(int argc, char *argv[]) {
 #endif
 
 	wl_list_init(&server.input_config);
+	wl_list_init(&server.output_config);
 
 	server.modes = malloc(4 * sizeof(char *));
 	if(!server.modes) {
@@ -337,8 +338,6 @@ main(int argc, char *argv[]) {
 		goto end;
 	}
 
-	wl_list_init(&server.output_config);
-
 	renderer = wlr_backend_get_renderer(backend);
 	wlr_renderer_init_wl_display(renderer, server.wl_display);
 
diff --git a/keybinding.c b/keybinding.c
index 0686d90..5d802fe 100644
--- a/keybinding.c
+++ b/keybinding.c
@@ -115,6 +115,9 @@ keybinding_list_init() {
 
 void
 keybinding_list_free(struct keybinding_list *list) {
+	if(!list) {
+		return;
+	}
 	for(unsigned int i = 0; i < list->length; ++i) {
 		keybinding_free(list->keybindings[i], true);
 	}