diff --git a/files.md5 b/files.md5
index 707fcde55..259ce4c38 100644
--- a/files.md5
+++ b/files.md5
@@ -1,5 +1,5 @@
 <?php
-// created: 2022-05-17 17:00:00
+// created: 2022-05-24 17:00:00
 $md5_string = array (
   './Api/Core/Config/ApiConfig.php' => '69a1e7b3d7755a2a63499a16ddae81cf',
   './Api/Core/Config/slim.php' => 'b134e68765e6a1403577e2a5a06322b8',
@@ -2838,7 +2838,7 @@ $md5_string = array (
   './lib/Utility/StringUtils.php' => '5d2af90994ef44072e2e10cde162f82b',
   './lib/Utility/StringValidator.php' => '2bb9c08a2cebaeea8979abdc8d090f23',
   './lib/Utility/SuiteLogger.php' => '79dc0516419b8f034f33b91bc3a0d59b',
-  './lib/Utility/SuiteValidator.php' => '12c10e9b70ffcd140e065489041c6518',
+  './lib/Utility/SuiteValidator.php' => '23f06edc677bf3eb1ca4c5aefd0d6781',
   './log_file_restricted.html' => '155a93e5d6349e5d7f0280ece884c3a9',
   './maintenance.php' => '779f8dac6809dfa06293a732a5865409',
   './metadata/accounts_bugsMetaData.php' => '63e4a98d2832a333b821fe62541b4de4',
diff --git a/lib/Utility/SuiteValidator.php b/lib/Utility/SuiteValidator.php
index cf03f2fec..47674af02 100644
--- a/lib/Utility/SuiteValidator.php
+++ b/lib/Utility/SuiteValidator.php
@@ -43,11 +43,15 @@ namespace SuiteCRM\Utility;
 class SuiteValidator
 {
     /**
-     * @param string $id
+     * @param string|null $id
      * @return bool
      */
-    public function isValidId(string $id): bool
+    public function isValidId(?string $id): bool
     {
+        if (empty($id)) {
+            return false;
+        }
+
         $pattern = $this->getIdValidationPattern();
 
         return is_numeric($id) || (is_string($id) && preg_match($pattern, $id));