diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index feb2ac424..78c70f954 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -444,6 +444,11 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
         return;
 
     Partition* part = modl->partitionForIndex( current );
+    if ( !part )
+    {
+        cDebug() << Q_FUNC_INFO << "Partition not found for index" << current;
+        return;
+    }
 
     double requiredStorageGB = Calamares::JobQueue::instance()
                                     ->globalStorage()