diff --git a/_UTIL/TestOracle/_CREA_WORK.bat b/_UTIL/TestOracle/_CREA_WORK.bat
index 3ef188c6..8004f8d7 100644
--- a/_UTIL/TestOracle/_CREA_WORK.bat
+++ b/_UTIL/TestOracle/_CREA_WORK.bat
@@ -22,7 +22,7 @@ ECHO @%BUILD%\DB%DBVER%\FCLT%DBVER%.sql >xtmp.sql
 ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
 ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql>>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 DEL xtmp.sql
 goto end
 
diff --git a/_UTIL/TestOracle/_CREA_WORK_UPDATE.bat b/_UTIL/TestOracle/_CREA_WORK_UPDATE.bat
index 8ecb1a8e..e7f5b463 100644
--- a/_UTIL/TestOracle/_CREA_WORK_UPDATE.bat
+++ b/_UTIL/TestOracle/_CREA_WORK_UPDATE.bat
@@ -21,7 +21,7 @@ sqlplus.exe system/XZSTXnHGjfNNODfQc@%targetSERVER% @.\CreateUser%targetSERVER%.
 ECHO @@%DBPRVPATH% >xtmp.sql
 ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 
 @TITLE Running DB%DBPRV%to%DBVER%.sql
 @ECHO   Running DB%DBPRV%to%DBVER%.sql on %targetUSER%@%targetSERVER% 1>&2
@@ -29,7 +29,7 @@ ECHO define ACCEPT_DB%DBVER%=1 >xtmp.sql
 ECHO @%BUILD%\DB%DBVER%\DB%DBPRV%to%DBVER%.sql >>xtmp.sql
 ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql >>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 DEL xtmp.sql
 DEL SUPPORTJWT*.LST
 goto end
diff --git a/_UTIL/TestOracle/emailerror.js b/_UTIL/TestOracle/emailerror.js
index 219bacbb..9e52fba0 100644
--- a/_UTIL/TestOracle/emailerror.js
+++ b/_UTIL/TestOracle/emailerror.js
@@ -1,6 +1,12 @@
 var wshShell = WScript.CreateObject( "WScript.Shell" );
 
+var dbver = WScript.Arguments(0).toUpperCase();
+
 fac_send_mail_html("j.grootlipman@facilitor.nl");
+fac_send_mail_html("e.groener@facilitor.nl");
+fac_send_mail_html("m.geerdink@facilitor.nl");
+fac_send_mail_html("a.tiehuis@facilitor.nl");
+fac_send_mail_html("gijs.wassink@aareon.nl");
 //fac_send_mail_html("glipman@home.nl");
 //fac_send_mail_html("helpdesk@facilitor.nl");
 
@@ -8,7 +14,9 @@ WScript.Echo(new Date());
 function fac_send_mail_html(adrTo,strSubj,strBody)
 {
     strSubj = "ORA-errors in TestOracle " + new Date();
-    strBody = "ORA-errors in TestOracle\n<code>" ;
+    strBody = "ORA-errors in TestOracle" ;
+    strBody += "<br/>More details in z:\\Project\\FACILITOR\\BUILD\\DB" + dbver + "\\OUTPUT"
+    strBody += "\n<br/><code>";
     while (!WScript.StdIn.AtEndOfStream)
     {
         strBody = strBody + WScript.StdIn.ReadAll();
@@ -34,6 +42,7 @@ function fac_send_mail_html(adrTo,strSubj,strBody)
     //var objAttachment = objMail.AddAttachment("diffwork_33.lst");
     //objAttachment.ContentTransferEncoding = "base64";
 
+    WScript.Echo("E-mailing to " + adrTo);
 
     objMail.To = adrTo;
     objMail.From = "oracletest@oracletest.facilitor.nl";
diff --git a/_UTIL/TestOracle/testworkCOMMON.bat b/_UTIL/TestOracle/testworkCOMMON.bat
index 5f4c5a08..5d4f4169 100644
--- a/_UTIL/TestOracle/testworkCOMMON.bat
+++ b/_UTIL/TestOracle/testworkCOMMON.bat
@@ -15,6 +15,11 @@ GOTO EINDE
 @echo off
 REM Usage: %0
 
+SET OUTPUT=%BUILD%\DB%DBVER%\OUTPUT
+MKDIR %OUTPUT%>nul
+MKDIR %OUTPUT%\OLD>nul
+move %OUTPUT%\*.lst %OUTPUT%\OLD
+
 PUSHD %SOURCE%
 CALL mx12 NOWAIT
 POPD
@@ -47,8 +52,10 @@ cscript compare.js %DBPRV% %DBVER% >>diffwork_%DBVER%.lst 2>>&1
 findstr /i "ORA-" "diffwork_%DBVER%.lst"
 if %errorlevel%==1 GOTO EINDE
 
-findstr /C:"ORA-" "diffwork_%DBVER%.lst" | cscript emailerror.js >> mail.log 2>>&1
+findstr /C:"ORA-" /C:"PLS-" "diffwork_%DBVER%.lst" | cscript emailerror.js %DBVER% >> %0.log 2>>&1
 @TITLE ORA-Errors found, e-mail sent
-PAUSE
+::PAUSE
 
-:EINDE
\ No newline at end of file
+:EINDE
+
+move *.lst %OUTPUT%
\ No newline at end of file