diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 744d188df..a0966d2f3 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -960,7 +960,7 @@ class Cases
                 //only when that variable is set.. from Save
                 $FieldsBefore = $this->loadCase($sAppUid);
                 $FieldsDifference = $this->arrayRecursiveDiff($FieldsBefore['APP_DATA'], $aApplicationFields);
-                $fieldsOnBoth = array_intersect_assoc($FieldsBefore['APP_DATA'], $aApplicationFields);
+                $fieldsOnBoth = @array_intersect_assoc($FieldsBefore['APP_DATA'], $aApplicationFields);
                 //Add fields that weren't in previous version
                 foreach ($aApplicationFields as $key => $value) {
                     if (!(isset($fieldsOnBoth[$key]))) {
diff --git a/workflow/engine/methods/cases/caseHistory_Ajax.php b/workflow/engine/methods/cases/caseHistory_Ajax.php
index c27ecdd9a..85c94c7f4 100644
--- a/workflow/engine/methods/cases/caseHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseHistory_Ajax.php
@@ -46,7 +46,8 @@ if ($actionAjax == 'historyGridList_JXP') {
     }
 
     $newDir = '/tmp/test/directory';
-    $r = G::verifyPath( $newDir );
+    G::verifyPath( $newDir );
+    $r = new stdclass();
     $r->data = $aProcesses;
     $r->totalCount = 2;