diff --git a/src/modules/rawfs/main.py b/src/modules/rawfs/main.py
index 736fc39cb..760498212 100644
--- a/src/modules/rawfs/main.py
+++ b/src/modules/rawfs/main.py
@@ -146,9 +146,10 @@ def update_global_storage(item, gs):
             ret = subprocess.run(["blkid", "-s", "UUID", "-o", "value", item.destination],
                     stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
             if ret.returncode == 0:
+                uuid = ret.stdout.rstrip()
                 libcalamares.utils.debug("Setting {} UUID to {}".format(item.destination,
-                        ret.stdout.rstrip()))
-                gs[gs.index(partition)]["uuid"] = ret.stdout.rstrip()
+                        uuid or "<empty>"))
+                gs[gs.index(partition)]["uuid"] = uuid
                 gs[gs.index(partition)]["source"] = item.source
 
     libcalamares.globalstorage.remove("partitions")