diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java
index ca4ff02d1..8e6f84f06 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java
@@ -333,8 +333,10 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
                 try {
                     consumer.accept(tenant);
                 } catch (final RuntimeException ex) {
-                    LOGGER.error("Exception on forEachTenant execution for tenant {}. Continue with next tenant.",
+                    LOGGER.debug("Exception on forEachTenant execution for tenant {}. Continue with next tenant.",
                             tenant, ex);
+                    LOGGER.error("Exception on forEachTenant execution for tenant {} with error message [{}]. "
+                            + "Continue with next tenant.", tenant, ex.getMessage());
                 }
                 return null;
             }));