diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 1b4e49bd6..d42e7b568 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -172,33 +172,31 @@ PartitionLayout::execute( Device* dev,
     // Let's check if we have enough space for each partSize
     for ( const auto& part : qAsConst( m_partLayout ) )
     {
-        qint64 size;
-        // Calculate partition size
+        if ( !part.partSize.isValid() )
+        {
+            cWarning() << "Partition" << part.partMountPoint << "size is invalid, skipping...";
+            continue;
+        }
 
-        if ( part.partSize.isValid() )
+        // Calculate partition size: Rely on "possibly uninitialized use"
+        // warnings to ensure that all the cases are covered below.
+        qint64 size;
+        // We need to ignore the percent-defined until later
+        if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
         {
-            // We need to ignore the percent-defined
-            if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
+            size = part.partSize.toSectors( totalSize, dev->logicalSize() );
+        }
+        else
+        {
+            if ( part.partMinSize.isValid() )
             {
-                size = part.partSize.toSectors( totalSize, dev->logicalSize() );
+                size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
             }
             else
             {
-                if ( part.partMinSize.isValid() )
-                {
-                    size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
-                }
-                else
-                {
-                    size = 0;
-                }
+                size = 0;
             }
         }
-        else
-        {
-            cWarning() << "Partition" << part.partMountPoint << "size (" << size << "sectors) is invalid, skipping...";
-            continue;
-        }
 
         partSizeMap.insert( &part, size );
         availableSize -= size;