diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 7fe849842..69ebb20e4 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -100,7 +100,7 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
         if partition["fs"] == "linuxswap":
             swap_uuid = partition["uuid"]
 
-        if partition["mountPoint"] == "/" and partition["luksMapperName"]:
+        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
             cryptdevice_params = [
                 "cryptdevice=UUID={!s}:{!s}".format(partition["uuid"],
                                                     partition["luksMapperName"]),
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index ea3876f2b..fffb74715 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -50,7 +50,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
         if partition["fs"] == "linuxswap":
             swap_uuid = partition["uuid"]
 
-        if partition["mountPoint"] == "/" and partition["luksMapperName"]:
+        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
             cryptdevice_params = [
                 "cryptdevice=UUID={!s}:{!s}".format(partition["uuid"],
                                                     partition["luksMapperName"]),
diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index d4bb14f20..512e46cf0 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -40,7 +40,8 @@ def mount_partitions(root_mount_point, partitions):
         if fstype == "fat16" or fstype == "fat32":
             fstype = "vfat"
 
-        if partition["luksMapperName"]:
+        if "luksMapperName" in partition:
+            libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"]))
             libcalamares.utils.mount(partition["luksMapperName"],
                                      mount_point,
                                      fstype,