diff --git a/02_ExtractIso.cmd b/02_ExtractIso.cmd
index e5d5a09..d38305a 100644
--- a/02_ExtractIso.cmd
+++ b/02_ExtractIso.cmd
@@ -1,7 +1,7 @@
 @echo off
 set T=c:\TEMP
 set W10=%T%\W10
-set ISODRIVE=Y:
+set DEVICEPATH=
 
 IF %1.==. GOTO USAGE
 
@@ -28,10 +28,10 @@ rd /S /Q %W10% 1>nul 2>nul
 mkdir %W10% 1>nul 2>nul
 
 echo mounting disk image (iso) with powershell ...
-powershell "$diskImg = Mount-DiskImage -ImagePath %ISOFILE% -NoDriveLetter; $volInfo = $diskImg | Get-Volume; mountvol %ISODRIVE% $volInfo.UniqueId"
+for /f %%i in ('"powershell $diskImage=Mount-DiskImage -ImagePath %ISOFILE% -NoDriveLetter; write-host $diskImage.DevicePath"') do @set DEVICEPATH=%%i
 
 echo copying files from image to targetpath %W10% ...
-robocopy %ISODRIVE%\ %W10% /MIR /256 /NFL /NDL /R:100
+robocopy %DEVICEPATH% %W10% /MIR /256 /NFL /NDL /R:100
 
 echo unmounting disk image (iso) ...
 powershell Dismount-Diskimage -ImagePath %ISOFILE%
diff --git a/03_PrepareBoot.cmd b/03_PrepareBoot.cmd
index d5431ad..047fef4 100644
--- a/03_PrepareBoot.cmd
+++ b/03_PrepareBoot.cmd
@@ -9,6 +9,13 @@ if NOT EXIST image (
   cd image
 )
 
+rem check for wim file ...
+if NOT EXIST %SOURCES%\boot.wim (
+  echo ERROR: [ %SOURCES%\boot.wim ] NOT FOUND!
+  cd ..
+  exit /b
+)
+
 echo =========================================
 echo START of BOOT image creation process ... 
 echo =========================================
diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd
index 8fd765d..519e37a 100644
--- a/04_PrepareImage.cmd
+++ b/04_PrepareImage.cmd
@@ -12,6 +12,13 @@ if NOT EXIST image (
   cd image
 )
 
+rem check for wim file ...
+if NOT EXIST %SOURCES%\install.wim (
+  echo ERROR: [ %SOURCES%\install.wim ] NOT FOUND!
+  cd ..
+  exit /b
+)
+
 echo =========================================
 echo START of MAIN image creation process ... 
 echo =========================================
diff --git a/image/mount-image.cmd b/image/mount-image.cmd
index 8f660dd..a069320 100644
--- a/image/mount-image.cmd
+++ b/image/mount-image.cmd
@@ -3,6 +3,15 @@ set SOURCES=c:\TEMP\W10\sources
 set IMAGE=c:\TEMP\IMAGE
 set NTLITE="%ProgramFiles%\NTLite\NTLite.exe"
 
+rem check for wim file ...
+if NOT EXIST %SOURCES%\boot.wim (
+  echo ERROR: [ %SOURCES%\boot.wim ] NOT FOUND!
+  echo ABORT.
+  exit /b
+) else (
+  cd image
+)
+
 echo creating image mountpoint ...
 mkdir %IMAGE% 1>nul 2>nul