diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php
index d4e708267..2feb40516 100644
--- a/workflow/engine/src/BusinessModel/Task.php
+++ b/workflow/engine/src/BusinessModel/Task.php
@@ -835,7 +835,11 @@ class Task
                                 'aas_type' => "user" );
                 $oDataset->next();
             }
-            return $aUsers;
+            if (empty($aUsers)) {
+                throw (new \Exception( 'Record not found for id: '. $sAssigneeUID));
+            } else {
+                return $aUsers;
+            }
         } catch (Exception $e) {
             throw $e;
         }
@@ -1169,7 +1173,11 @@ class Task
                                 'aas_type' => "user" );
                 $oDataset->next();
             }
-            return $aUsers;
+            if (empty($aUsers)) {
+                throw (new \Exception( 'Record not found for id: '. $sAssigneeUID));
+            } else {
+                return $aUsers;
+            }
         } catch (Exception $e) {
             throw $e;
         }
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
index 09acd897c..cb96794e0 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
@@ -89,16 +89,16 @@ class Assignee extends Api
      *
      * @param string $prjUid
      * @param string $actUid
-     * @param string $assUid
-     * @param string $assType {@choice user,group}
+     * @param string $ass_uid
+     * @param string $ass_type {@choice user,group}
      *
      * @status 201
      */
-    public function doPostActivityAssignee($prjUid, $actUid, $assUid, $assType)
+    public function doPostActivityAssignee($prjUid, $actUid, $ass_uid, $ass_type)
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->addTaskAssignee($prjUid, $actUid, $assUid, $assType);
+            $arrayData = $task->addTaskAssignee($prjUid, $actUid, $ass_uid, $ass_type);
             //Response
             $response = $arrayData;
         } catch (\Exception $e) {
@@ -206,16 +206,16 @@ class Assignee extends Api
      *
      * @param string $prjUid
      * @param string $actUid
-     * @param string $assUid
-     * @param string $assType {@choice user,group}
+     * @param string $ass_uid
+     * @param string $ass_type {@choice user,group}
      *
      * @status 201
      */
-    public function doPostActivityAdhocAssignee($prjUid, $actUid, $assUid, $assType)
+    public function doPostActivityAdhocAssignee($prjUid, $actUid, $ass_uid, $ass_type)
     {
         try {
             $task = new \BusinessModel\Task();
-            $arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $assUid, $assType);
+            $arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $ass_uid, $ass_type);
             //Response
             $response = $arrayData;
         } catch (\Exception $e) {