diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSystemManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSystemManagement.java
index d960f2f3e..a08bc7ee0 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSystemManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSystemManagement.java
@@ -359,9 +359,6 @@ public class JpaSystemManagement implements CurrentTenantCacheKeyGenerator, Syst
         try {
             currentTenantCacheKeyGenerator.setTenantInCreation(tenant);
             return createInitialTenantMetaData(tenant);
-        } catch (final Throwable t) {
-            LOGGER.error("Failed to create tenant: {}", tenant, t);
-            return null;
         } finally {
             currentTenantCacheKeyGenerator.removeTenantInCreation();
         }