diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index abbd3d524..f793c9b7f 100644
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -162,7 +162,6 @@ class FstabGenerator(object):
             return None
 
         mapper_name = partition["luksMapperName"]
-        mount_point = partition["mountPoint"]
         luks_uuid = partition["luksUuid"]
         if not mapper_name or not luks_uuid:
             return None
@@ -266,12 +265,12 @@ class FstabGenerator(object):
             self.root_is_ssd = is_ssd
 
         if filesystem == "btrfs" and "subvol" in partition:
-            options="subvol={},".format(partition["subvol"]) + options
+            options = "subvol={},".format(partition["subvol"]) + options
 
         if has_luks:
-            device="/dev/mapper/" + partition["luksMapperName"]
+            device = "/dev/mapper/" + partition["luksMapperName"]
         else:
-            device="UUID=" + partition["uuid"]
+            device = "UUID=" + partition["uuid"]
 
         return dict(device=device,
                     mount_point=mount_point,
@@ -308,13 +307,17 @@ def run():
     root_mount_point = global_storage.value("rootMountPoint")
 
     if not partitions:
-        libcalamares.utils.warning("partitions is empty, {!s}".format(partitions))
+        libcalamares.utils.warning("partitions is empty, {!s}"
+                                   .format(partitions))
         return (_("Configuration Error"),
-                _("No partitions are defined for <pre>{!s}</pre> to use." ).format("fstab"))
+                _("No partitions are defined for <pre>{!s}</pre> to use.")
+                .format("fstab"))
     if not root_mount_point:
-        libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))
+        libcalamares.utils.warning("rootMountPoint is empty, {!s}"
+                                   .format(root_mount_point))
         return (_("Configuration Error"),
-                _("No root mount point is given for <pre>{!s}</pre> to use." ).format("fstab"))
+                _("No root mount point is given for <pre>{!s}</pre> to use.")
+                .format("fstab"))
 
     mount_options = conf["mountOptions"]
     ssd_extra_mount_options = conf.get("ssdExtraMountOptions", {})