diff --git a/README.md b/README.md
index 3a6f5c3..91030ea 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,9 @@ For more information about the upstream Calamares project, visit
 https://calamares.euroquis.nl/
 
 # Release notes
+## Version 1.2.1
+* Fix segfault when no partitions are on the selected disk
+
 ## Version 1.2.0
 * Fix slideshow image display
 * Add bmap support for SEAPATH Debian images
diff --git a/build.sh b/build.sh
index 6a054d0..c85d717 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 export DESTDIR=/tmp/sysroot-seapath-installer
 export BUILDDIR=./build
 export CMAKE_ARGS="-DWITH_QT6=OFF"
-export VERSION="1.2.0"
+export VERSION="1.2.1"
 ./ci/build.sh
 mkdir -p seapath-installer_${VERSION}_all/etc/calamares
 mkdir -p seapath-installer_${VERSION}_all/usr/share/calamares/modules
diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control
index 6ddefe9..450217f 100644
--- a/debian/DEBIAN/control
+++ b/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: seapath-installer
-Version: 1.2.0
+Version: 1.2.1
 Architecture: all
 Essential: no
 Priority: optional
diff --git a/src/branding/seapath/branding.desc b/src/branding/seapath/branding.desc
index 3ac1783..97169e7 100644
--- a/src/branding/seapath/branding.desc
+++ b/src/branding/seapath/branding.desc
@@ -123,15 +123,15 @@ navigation: widget
 strings:
     productName:         "LFEnergy SEAPATH"
     shortProductName:    "SEAPATH"
-    version:             1.2.0
-    shortVersion:        1.2.0
-    versionedName:       LFEnergy SEAPATH 1.2.0
-    shortVersionedName:  SEAPATH 1.2.0
+    version:             1.2.1
+    shortVersion:        1.2.1
+    versionedName:       LFEnergy SEAPATH 1.2.1
+    shortVersionedName:  SEAPATH 1.2.1
     bootloaderEntryName: SEAPATH
     productUrl:          https://lfenergy.org/projects/seapath/
     supportUrl:          https://lf-energy.atlassian.net/wiki/spaces/SEAP/overview
     knownIssuesUrl:
-    releaseNotesUrl:     https://lf-energy.atlassian.net/wiki/spaces/SEAP/pages/248250373/1.2.0
+    releaseNotesUrl:     https://lf-energy.atlassian.net/wiki/spaces/SEAP/pages/248250373/1.2.1
     donateUrl:
 
 # These images are loaded from the branding module directory.
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 268e75d..d6838be 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -1010,6 +1010,16 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
             targetDevice = selectedDevice();  // Refresh the targetDevice reference
         }
 
+        PartitionTable* pt = targetDevice ? targetDevice->partitionTable() : nullptr;
+        if ( !pt )
+        {
+            cDebug() << "No partition table found on device";
+            m_messageLabel->setText( tr( "This storage device has no partition table. "
+                                         "Partitions preview not available." ) );
+            m_messageLabel->show();
+            break;
+        }
+
         // Remove directly the partition table without creating jobs (preview only)
         cDebug() << "Removing all existing partitions from preview (no jobs created)";
         QList< Partition* > partitionsToDelete;