diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index a489db6c1a0..1a34bd038c8 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -1179,13 +1179,13 @@ DeviceFileAccess *FilePath::fileAccess() const
     static DeviceFileAccess dummy;
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
     QTC_ASSERT_EXPECTED(access, return &dummy);
-    return *access ? *access : &dummy;
+    return *access;
 }
 
 bool FilePath::hasFileAccess() const
 {
     const expected_str<DeviceFileAccess *> access = getFileAccess(*this);
-    return access && access.value();
+    return access.has_value();
 }
 
 /*!
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 57052d354f6..b06d5a14694 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -417,12 +417,17 @@ DeviceManager::DeviceManager(bool isInstance) : d(std::make_unique<DeviceManager
     deviceHooks.fileAccess = [](const FilePath &filePath) -> expected_str<DeviceFileAccess *> {
         if (!filePath.needsDevice())
             return DesktopDeviceFileAccess::instance();
-        auto device = DeviceManager::deviceForPath(filePath);
+        IDevice::ConstPtr device = DeviceManager::deviceForPath(filePath);
         if (!device) {
             return make_unexpected(
                 QString("No device found for path \"%1\"").arg(filePath.toUserOutput()));
         }
-        return device->fileAccess();
+        DeviceFileAccess *fileAccess = device->fileAccess();
+        if (!fileAccess) {
+            return make_unexpected(
+                QString("No file access for device \"%1\"").arg(device->displayName()));
+        }
+        return fileAccess;
     };
 
     deviceHooks.environment = [](const FilePath &filePath) -> expected_str<Environment> {