diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index 4721370b9..7492f1f8b 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -158,13 +158,6 @@ void
 ViewManager::insertViewStep( int before, ViewStep* step )
 {
     m_steps.insert( before, step );
-    QLayout* layout = step->widget()->layout();
-    if ( layout )
-    {
-        layout->setContentsMargins( 0, 0, 0, 0 );
-    }
-    m_stack->insertWidget( before, step->widget() );
-
     connect( step, &ViewStep::enlarge, this, &ViewManager::enlarge );
     connect( step, &ViewStep::nextStatusChanged, this, [this]( bool status ) {
         ViewStep* vs = qobject_cast< ViewStep* >( sender() );
@@ -177,6 +170,17 @@ ViewManager::insertViewStep( int before, ViewStep* step )
         }
     } );
 
+    if ( !step->widget() )
+    {
+        cError() << "ViewStep" << step->moduleInstanceKey() << "has no widget.";
+    }
+
+    QLayout* layout = step->widget()->layout();
+    if ( layout )
+    {
+        layout->setContentsMargins( 0, 0, 0, 0 );
+    }
+    m_stack->insertWidget( before, step->widget() );
     m_stack->setCurrentIndex( 0 );
     step->widget()->setFocus();
 }