diff --git a/workflow/engine/src/BusinessModel/DataBaseConnection.php b/workflow/engine/src/BusinessModel/DataBaseConnection.php
index 0b25422c2..cd95698a0 100644
--- a/workflow/engine/src/BusinessModel/DataBaseConnection.php
+++ b/workflow/engine/src/BusinessModel/DataBaseConnection.php
@@ -109,6 +109,19 @@ class DataBaseConnection
             }
         }
 
+        if (isset($dataDBConnection['DBS_SERVER']) && $dataDBConnection['DBS_SERVER'] == '') {
+            throw (new \Exception("This 'dbs_server' is invalid"));
+        }
+
+        if (isset($dataDBConnection['DBS_DATABASE_NAME']) && $dataDBConnection['DBS_DATABASE_NAME'] == '') {
+            throw (new \Exception("This 'dbs_database_name' is invalid"));
+        }
+
+        if (isset($dataDBConnection['DBS_PORT']) &&
+            ($dataDBConnection['DBS_PORT'] == ''|| $dataDBConnection['DBS_PORT'] == 0)) {
+            throw (new \Exception("This 'dbs_port' is invalid"));
+        }
+
         if (isset($dataDBConnection['DBS_ENCODE'])) {
             $encodesExists = array();
             $dbs = new dbConnections();
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
index 42791907e..7f898eb0c 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/DataBaseConnection.php
@@ -58,12 +58,12 @@ class DataBaseConnection extends Api
      * @param string $prj_uid {@min 1} {@max 32}
      * @param array $request_data
      *
-     * @param string $dbs_type {@from body} {@min 1}
-     * @param string $dbs_server {@from body} {@min 1}
-     * @param string $dbs_database_name {@from body} {@min 1}
+     * @param string $dbs_type {@from body} {@required true}
+     * @param string $dbs_server {@from body} {@required true}
+     * @param string $dbs_database_name {@from body} {@required true}
      * @param string $dbs_username {@from body}
      * @param string $dbs_port {@from body} {@type float}
-     * @param string $dbs_encode {@from body} {@min 1}
+     * @param string $dbs_encode {@from body} {@required true}
      * @param string $dbs_password {@from body}
      * @param string $dbs_description {@from body}
      * @return array
@@ -99,12 +99,12 @@ class DataBaseConnection extends Api
      * @param string $prj_uid {@min 1} {@max 32}
      * @param array $request_data
      *
-     * @param string $dbs_type {@from body} {@min 1}
-     * @param string $dbs_server {@from body} {@min 1}
-     * @param string $dbs_database_name {@from body} {@min 1}
+     * @param string $dbs_type {@from body} {@required true}
+     * @param string $dbs_server {@from body} {@required true}
+     * @param string $dbs_database_name {@from body} {@required true}
      * @param string $dbs_username {@from body}
      * @param string $dbs_port {@from body} {@type float}
-     * @param string $dbs_encode {@from body} {@min 1}
+     * @param string $dbs_encode {@from body} {@required true}
      * @param string $dbs_password {@from body}
      * @param string $dbs_description {@from body}
      * @return array
@@ -141,12 +141,12 @@ class DataBaseConnection extends Api
      * @param string $dbs_uid {@min 1} {@max 32}
      * @param array $request_data
      *
-     * @param string $dbs_type {@from body}
-     * @param string $dbs_server {@from body}
-     * @param string $dbs_database_name {@from body}
+     * @param string $dbs_type {@from body} {@required true}
+     * @param string $dbs_server {@from body} {@required true}
+     * @param string $dbs_database_name {@from body} {@required true}
      * @param string $dbs_username {@from body}
-     * @param string $dbs_port {@from body}
-     * @param string $dbs_encode {@from body}
+     * @param string $dbs_port {@from body} {@type float}
+     * @param string $dbs_encode {@from body} {@required true}
      * @param string $dbs_password {@from body}
      * @param string $dbs_description {@from body}
      * @return void