diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp
index da67f9dd2..f24c7b61b 100644
--- a/src/libcalamares/utils/TestPaths.cpp
+++ b/src/libcalamares/utils/TestPaths.cpp
@@ -117,7 +117,10 @@ TestPaths::testTargetPath()
 void
 TestPaths::testCreateTarget()
 {
-    QCOMPARE( m_system->createTargetFile( testFile, "Hello" ), QString( absFile ) );  // Success
+    auto r = m_system->createTargetFile( testFile, "Hello" );
+    QVERIFY( !r.failed() );
+    QVERIFY( r );
+    QCOMPARE( r.path(), QString( absFile ) );  // Success
 
     QFileInfo fi( absFile );
     QVERIFY( fi.exists() );
diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp
index af8e07ca7..468047c45 100644
--- a/src/modules/initramfs/InitramfsJob.cpp
+++ b/src/modules/initramfs/InitramfsJob.cpp
@@ -54,7 +54,7 @@ InitramfsJob::exec()
         // First make sure we generate a safe initramfs with suitable permissions.
         static const char confFile[] = "/etc/initramfs-tools/conf.d/calamares-safe-initramfs.conf";
         static const char contents[] = "UMASK=0077\n";
-        if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).isEmpty() )
+        if ( CalamaresUtils::System::instance()->createTargetFile( confFile, QByteArray( contents ) ).failed() )
         {
             cWarning() << Logger::SubEntry << "Could not configure safe UMASK for initramfs.";
             // But continue anyway.
diff --git a/src/modules/initramfs/Tests.cpp b/src/modules/initramfs/Tests.cpp
index 936c94097..39d2abeaa 100644
--- a/src/modules/initramfs/Tests.cpp
+++ b/src/modules/initramfs/Tests.cpp
@@ -57,9 +57,12 @@ void InitramfsTests::cleanup()
 
 void InitramfsTests::testCreateHostFile()
 {
-    
+
     CalamaresUtils::System s( false );  // don't chroot
-    QString path = s.createTargetFile( confFile, QByteArray( contents ) );
+    auto r = s.createTargetFile( confFile, QByteArray( contents ) );
+    QVERIFY( !r.failed() );
+    QVERIFY( r );
+    QString path = r.path();
     QVERIFY( !path.isEmpty() );
     QCOMPARE( path, confFile );  // don't chroot, so path create relative to /
     QVERIFY( QFile::exists( confFile ) );
@@ -67,30 +70,33 @@ void InitramfsTests::testCreateHostFile()
     QFileInfo fi( confFile );
     QVERIFY( fi.exists() );
     QCOMPARE( fi.size(), sizeof( contents )-1 );  // don't count trailing NUL
-    
+
     QFile::remove( confFile );
 }
 
 void InitramfsTests::testCreateTargetFile()
 {
     static const char short_confFile[] = "/calamares-safe-umask";
-    
+
     CalamaresUtils::System s( true );
-    QString path = s.createTargetFile( short_confFile, QByteArray( contents ) );
+    auto r = s.createTargetFile( short_confFile, QByteArray( contents ) );
+    QVERIFY( r.failed() );
+    QVERIFY( !r );
+    QString path = r.path();
     QVERIFY( path.isEmpty() );  // because no rootmountpoint is set
-    
+
     Calamares::JobQueue j;
     j.globalStorage()->insert( "rootMountPoint", "/tmp" );
-    
+
     path = s.createTargetFile( short_confFile, QByteArray( contents ) );
-    QVERIFY( path.endsWith( short_confFile ) );  // chroot, so path create relative to 
+    QVERIFY( path.endsWith( short_confFile ) );  // chroot, so path create relative to
     QVERIFY( path.startsWith( "/tmp/" ) );
     QVERIFY( QFile::exists( path ) );
 
     QFileInfo fi( path );
     QVERIFY( fi.exists() );
     QCOMPARE( fi.size(), sizeof( contents )-1 );  // don't count trailing NUL
-    
+
     QFile::remove( path );
 
 }
diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp
index 53abd0482..9ee3b3b6e 100644
--- a/src/modules/machineid/Tests.cpp
+++ b/src/modules/machineid/Tests.cpp
@@ -122,8 +122,13 @@ MachineIdTests::testJob()
     gs->insert( "rootMountPoint", "/tmp" );
 
     // Prepare part of the target filesystem
-    QVERIFY( system->createTargetDirs("/etc") );
-    QVERIFY( !(system->createTargetFile( "/etc/machine-id", "Hello" ).isEmpty() ) );
+    {
+        QVERIFY( system->createTargetDirs("/etc") );
+        auto r = system->createTargetFile( "/etc/machine-id", "Hello" );
+        QVERIFY( !r.failed() );
+        QVERIFY( r );
+        QVERIFY( !r.path().isEmpty() );
+    }
 
     MachineIdJob job( nullptr );
     QVERIFY( !job.prettyName().isEmpty() );