diff --git a/03_MakeAll.cmd b/03_MakeAll.cmd
index 1e8cf7e..6f071f2 100644
--- a/03_MakeAll.cmd
+++ b/03_MakeAll.cmd
@@ -28,6 +28,11 @@ for %%S in (
   finish-boot.cmd
 
   export-image.cmd
+  IF %ERRORLEVEL% NEQ 0 (
+    echo ERROR while exporting image
+    exit /b
+  )
+
   mount-image.cmd
   remove-apps.cmd
   remove-packages.cmd
diff --git a/wim/export-image.cmd b/wim/export-image.cmd
index 6e46cf7..e0878ac 100644
--- a/wim/export-image.cmd
+++ b/wim/export-image.cmd
@@ -5,6 +5,17 @@ set WIM=%SOURCES%\install.wim
 set W10PRO=%SOURCES%\w10pro.wim
 set STATEFILE=%SOURCES%\w10pro.txt
 
+
+if EXIST %STATEFILE% (
+
+  echo.
+  echo INFO: found %STATEFILE% 
+  echo nothing todo. all work was already done.
+  echo READY.
+  exit /b
+
+)
+
 if EXIST %ESD% (
 
   echo.
@@ -54,15 +65,5 @@ if EXIST %WIM% (
 
 )
 
-if EXIST %STATEFILE% (
-
-  echo.
-  echo INFO: found %STATEFILE% 
-  echo nothing todo. all work was already done.
-  echo READY.
-  exit /b
-
-)
-
 set ERRORLEVEL=9009