diff --git a/workflow/engine/src/BusinessModel/CaseScheduler.php b/workflow/engine/src/BusinessModel/CaseScheduler.php
index 897e0559c..779dbce32 100644
--- a/workflow/engine/src/BusinessModel/CaseScheduler.php
+++ b/workflow/engine/src/BusinessModel/CaseScheduler.php
@@ -69,6 +69,10 @@ class CaseScheduler
     public function getCaseScheduler($sProcessUID = '', $sCaseSchedulerUID = '')
     {
         try {
+            $oCaseSchedulerTest = \CaseSchedulerPeer::retrieveByPK( $sCaseSchedulerUID );
+            if (is_null($oCaseSchedulerTest)) {
+                throw (new \Exception( 'This id: '. $sCaseSchedulerUID .' do not correspond to a registered case scheduler'));
+            }
             $oCriteria = new \Criteria( 'workflow' );
             $oCriteria->clearSelectColumns();
             $oCriteria->addSelectColumn( \CaseSchedulerPeer::SCH_UID );
@@ -193,7 +197,7 @@ class CaseScheduler
      */
     public function getUser($userName, $userPass, $sProcessUID, $sTaskUID)
     {
-        try {
+        try {            
             $sPRO_UID = $sProcessUID;
             $sTASKS = $sTaskUID;
             $sWS_USER = trim( $userName );
@@ -455,6 +459,7 @@ class CaseScheduler
                     break;
             }
             if (($sOption != '1') && ($sOption != '4') && ($sOption != '5')) {
+                $sDateTmp = '';
                 if ($sStartDay == '') {
                     $sStartDay = date( 'Y-m-d' );
                 }
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/CaseScheduler.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/CaseScheduler.php
index c8c4d86a4..ee02526dd 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/CaseScheduler.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/CaseScheduler.php
@@ -113,7 +113,6 @@ class CaseScheduler extends Api
             //response
             throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
         }
-        return $response;
     }
 }