diff --git a/workflow/engine/classes/Calendar.php b/workflow/engine/classes/Calendar.php
index fe49aca98..91f257418 100644
--- a/workflow/engine/classes/Calendar.php
+++ b/workflow/engine/classes/Calendar.php
@@ -315,7 +315,7 @@ class Calendar extends CalendarDefinition
      * @param string(32) $proUid
      * @param string(32) $tasUid
      */
-    function Calendar ($userUid = NULL, $proUid = NULL, $tasUid = NULL)
+    function __construct($userUid = NULL, $proUid = NULL, $tasUid = NULL)
     {
         $this->userUid = $userUid;
         $this->proUid = $proUid;
diff --git a/workflow/engine/classes/class.pmScript.php b/workflow/engine/classes/class.pmScript.php
index 83585e2d5..19158ae00 100644
--- a/workflow/engine/classes/class.pmScript.php
+++ b/workflow/engine/classes/class.pmScript.php
@@ -304,7 +304,7 @@ class PMScript
     public function executeAndCatchErrors($sScript, $sCode)
     {
         ob_start('handleFatalErrors');
-        set_error_handler('handleErrors');
+        set_error_handler('handleErrors', ini_get('error_reporting'));
         $_SESSION['_CODE_'] = $sCode;
         $_SESSION['_DATA_TRIGGER_'] = $this->dataTrigger;
         $_SESSION['_DATA_TRIGGER_']['_EXECUTION_TIME_'] = microtime(true);