diff --git a/API_MachMgr.cpp b/API_MachMgr.cpp
index 06cd115..a1bfd18 100644
--- a/API_MachMgr.cpp
+++ b/API_MachMgr.cpp
@@ -1386,10 +1386,9 @@ __stdcall EgtApplyAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList)
    if ( &wsErrList == nullptr)
       return FALSE ;
    string sErrList ;
-   if ( ! ExeApplyAllMachinings( bStopOnFirstErr != FALSE, sErrList))
-      return FALSE ;
+   bool bOk = ExeApplyAllMachinings( bStopOnFirstErr != FALSE, sErrList) ;
    wsErrList = _wcsdup( stringtoW( sErrList)) ;
-   return  (( wsErrList == nullptr) ? FALSE : TRUE) ;
+   return ( ( bOk && wsErrList != nullptr) ? TRUE : FALSE) ;
 }
 
 //-----------------------------------------------------------------------------
@@ -1399,10 +1398,9 @@ __stdcall EgtUpdateAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList)
    if ( &wsErrList == nullptr)
       return FALSE ;
    string sErrList ;
-   if ( ! ExeUpdateAllMachinings( bStopOnFirstErr != FALSE, sErrList))
-      return FALSE ;
+   bool bOk = ExeUpdateAllMachinings( bStopOnFirstErr != FALSE, sErrList) ;
    wsErrList = _wcsdup( stringtoW( sErrList)) ;
-   return  (( wsErrList == nullptr) ? FALSE : TRUE) ;
+   return ( ( bOk && wsErrList != nullptr) ? TRUE : FALSE) ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/EgtInterface.rc b/EgtInterface.rc
index 1b1a628..f89edd2 100644
Binary files a/EgtInterface.rc and b/EgtInterface.rc differ