diff --git a/src/main.c b/src/main.c
index bb4d00d..0e4aa2d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -580,8 +580,11 @@ static int init_wayland(struct wayvnc* self, const char* display)
 
 failure:
 	wl_display_disconnect(self->display);
+	self->display = NULL;
 handler_failure:
-	aml_unref(self->wl_handler);
+	if (self->wl_handler)
+		aml_unref(self->wl_handler);
+	self->wl_handler = NULL;
 	return -1;
 }