diff --git a/src/drm.cpp b/src/drm.cpp
index f12023e..08ba6a0 100644
--- a/src/drm.cpp
+++ b/src/drm.cpp
@@ -575,11 +575,13 @@ int init_drm(struct drm_t *drm, const char *device_name)
 	}
 
 	drm->lo_device = liftoff_device_create( drm->fd );
+	if ( drm->lo_device == nullptr )
+		return -1;
 	drm->lo_output = liftoff_output_create( drm->lo_device, drm->crtc->id );
-
-	liftoff_device_register_all_planes( drm->lo_device );
-
-	assert( drm->lo_device && drm->lo_output );
+	if ( drm->lo_output == nullptr )
+		return -1;
+	if ( liftoff_device_register_all_planes( drm->lo_device ) < 0 )
+		return -1;
 
 	for ( int i = 0; i < k_nMaxLayers; i++ )
 	{
diff --git a/subprojects/libliftoff b/subprojects/libliftoff
index 61fd4c0..516cf94 160000
--- a/subprojects/libliftoff
+++ b/subprojects/libliftoff
@@ -1 +1 @@
-Subproject commit 61fd4c099a43b3b22dd48ccdbd76b4c3ab897d25
+Subproject commit 516cf9404df801b069065d14315cf6322f64a209