diff --git a/library/blivet.py b/library/blivet.py
index 1f0473a..a03d88c 100644
--- a/library/blivet.py
+++ b/library/blivet.py
@@ -316,7 +316,11 @@
         if self._device:
             return
 
-        device = self._blivet.devicetree.resolve_device(self._get_device_id())
+        device_id = self._get_device_id()
+        if device_id is None:
+            return
+
+        device = self._blivet.devicetree.resolve_device(device_id)
         if device is None:
             return
 
@@ -501,7 +501,11 @@ class BlivetPartitionVolume(BlivetVolume):
         return self._device.raw_device.type == 'partition'
 
     def _get_device_id(self):
-        return self._blivet_pool._disks[0].name + '1'
+        device_id = None
+        if self._blivet_pool._disks[0].partitioned and len(self._blivet_pool._disks[0].children) == 1:
+            device_id = self._blivet_pool._disks[0].children[0].name
+
+        return device_id
 
     def _resize(self):
         pass