diff --git a/prowler/lib/check/check.py b/prowler/lib/check/check.py
index 8c039b75..bfd333fa 100644
--- a/prowler/lib/check/check.py
+++ b/prowler/lib/check/check.py
@@ -243,10 +243,14 @@ def recover_checks_from_provider(provider: str, service: str = None) -> list[tup
                 check_name = check_module_name.split(".")[-1]
                 check_info = (check_name, check_path)
                 checks.append(check_info)
-        return checks
+    except ModuleNotFoundError:
+        logger.critical(f"Service {service} was not found for the {provider} provider.")
+        sys.exit()
     except Exception as e:
         logger.critical(f"{e.__class__.__name__}[{e.__traceback__.tb_lineno}]: {e}")
         sys.exit()
+    else:
+        return checks
 
 
 def list_compliance_modules():
diff --git a/prowler/lib/check/checks_loader.py b/prowler/lib/check/checks_loader.py
index 2e71daea..48363371 100644
--- a/prowler/lib/check/checks_loader.py
+++ b/prowler/lib/check/checks_loader.py
@@ -47,7 +47,7 @@ def load_checks_to_execute(
         for service in service_list:
             modules = recover_checks_from_provider(provider, service)
             if not modules:
-                logger.error(f"Service '{service}' was not found for the AWS provider")
+                logger.error(f"Service '{service}' does not have checks.")
             else:
                 for check_module in modules:
                     # Recover check name and module name from import path