diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index c6b75a5f6..eee0bf7b2 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -228,13 +228,13 @@ class BpmnWorkflow extends Project\Bpmn
                         }
 
                         // update case scheduler
-                        if ($event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
+                        if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
                             $aData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"], 'SCH_UID'=>$data["FLO_ELEMENT_ORIGIN"]);
                             $this->wp->updateCaseScheduler($aData);
                         }
 
                         // update web entry
-                        if ($event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
+                        if ($event && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
                             $aData = array('TAS_UID'=>$data["FLO_ELEMENT_DEST"], 'WE_UID'=>$data["FLO_ELEMENT_ORIGIN"]);
                             $this->wp->updateWebEntry($aData);
                         }
@@ -287,28 +287,8 @@ class BpmnWorkflow extends Project\Bpmn
             // update case scheduler
             if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "TIMER") {
                 $aData = array(
-                    'SCH_NAME'=>'',
-                    'SCH_DEL_USER_NAME'=>'',
-                    'SCH_DEL_USER_UID'=>'',
                     'TAS_UID'=>'',
-                    'SCH_LAST_RUN_TIME'=>NULL,
-                    'SCH_STATE'=>'',
-                    'SCH_LAST_STATE'=>'',
-                    'USR_UID'=>'',
-                    'SCH_OPTION'=>'',
-                    'SCH_DAYS_PERFORM_TASK'=>'',
-                    'SCH_EVERY_DAYS'=>NULL,
-                    'SCH_WEEK_DAYS'=>'',
-                    'SCH_START_DAY'=>'',
-                    'SCH_START_DAY_OPT_1'=>'',
-                    'SCH_START_DAY_OPT_2'=>'',
-                    'SCH_MONTHS'=>'',
-                    'SCH_REPEAT_EVERY'=>'',
-                    'SCH_REPEAT_STOP_IF_RUNNING'=>'',
-                    'CASE_SH_PLUGIN_UID'=>NULL,
-                    'SCH_DEL_USER_PASS'=>'',
-                    'SCH_UID'=>$flow->getFloElementOrigin(),
-                    'SCH_REPEAT_UNTIL'=>''
+                    'SCH_UID'=>$flow->getFloElementOrigin()
                 );
                 $this->wp->updateCaseScheduler($aData);
             }
@@ -316,17 +296,8 @@ class BpmnWorkflow extends Project\Bpmn
             // update web entry
             if (! is_null($event) && $event->getEvnType() == "START" && $event->getEvnMarker() == "MESSAGE") {
                 $aData = array(
-                    'WE_UID'=>$flow->getFloElementOrigin(),
                     'TAS_UID'=>'',
-                    'DYN_UID'=>'',
-                    'TAS_UID'=>'',
-                    'USR_UID'=>'',
-                    'WE_METHOD'=>'',
-                    'WE_INPUT_DOCUMENT_ACCESS'=>'',
-                    'WE_DATA'=>'',
-                    'WE_CREATE_USR_UID'=>'',
-                    'WE_UPDATE_USR_UID'=>'',
-                    'WE_UPDATE_DATE'=>date('Y-m-d H:i:s')
+                    'WE_UID'=>$flow->getFloElementOrigin()
                 );
                 $this->wp->updateWebEntry($aData);
             }
@@ -370,12 +341,12 @@ class BpmnWorkflow extends Project\Bpmn
         $event = \BpmnEventPeer::retrieveByPK($eventUid);
 
         // create case scheduler
-        if ($event->getEvnMarker() == "TIMER" && $event->getEvnType() == "START") {
+        if ($event && $event->getEvnMarker() == "TIMER" && $event->getEvnType() == "START") {
             $this->wp->addCaseScheduler($eventUid);
         }
 
         // create web entry
-        if ($event->getEvnMarker() == "MESSAGE" && $event->getEvnType() == "START") {
+        if ($event && $event->getEvnMarker() == "MESSAGE" && $event->getEvnType() == "START") {
             $this->wp->addWebEntry($eventUid);
         }
 
@@ -388,12 +359,12 @@ class BpmnWorkflow extends Project\Bpmn
         $event = \BpmnEventPeer::retrieveByPK($data);
 
         // delete case scheduler
-        if ($event->getEvnMarker() == "TIMER" && $event->getEvnType() == "START") {
+        if ($event && $event->getEvnMarker() == "TIMER" && $event->getEvnType() == "START") {
             $this->wp->removeCaseScheduler($data);
         }
 
         // delete web entry
-        if ($event->getEvnMarker() == "MESSAGE" && $event->getEvnType() == "START") {
+        if ($event && $event->getEvnMarker() == "MESSAGE" && $event->getEvnType() == "START") {
             $this->wp->removeWebEntry($data);
         }