diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
index c5afa21ec..281de7100 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class TenantRequest {
 
-    @NotNull
+    @NotNull @NotBlank
     private String tenantId;
     @NotBlank
     private String displayName;
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
index d52907f26..ab713f923 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
@@ -90,6 +90,17 @@ public class TenantManagementService {
     }
 
 
+    private void handleClientException(PSQLException e) {
+
+        if (e.getSQLState().equals("28000") || e.getSQLState().equals("28P01")) {
+            throw new IllegalArgumentException("Database credentials are not correct. Please check them.");
+        }
+        if (SQL_CONNECTION_ERROR_CODES.contains(e.getSQLState())) {
+            throw new IllegalArgumentException("Error when connecting to tenant database. Please check the jdbcUrl parameter.");
+        }
+    }
+
+
     private void handleInternalException(PSQLException e) {
 
         log.error(String.format("Connection to tenant DB failed with SQL state %s. Please check if the tenant DB is still running. " + //
@@ -98,17 +109,6 @@ public class TenantManagementService {
     }
 
 
-    private void handleClientException(PSQLException e) {
-
-        if (e.getSQLState().equals("28000") || e.getSQLState().equals("28P01")) {
-            throw new IllegalArgumentException("Database credentials are not correct. Please check them.", e);
-        }
-        if (SQL_CONNECTION_ERROR_CODES.contains(e.getSQLState())) {
-            throw new IllegalArgumentException("Error when connecting to tenant database. Please check the jdbcUrl parameter.", e);
-        }
-    }
-
-
     public List<TenantResponse> getTenants() {
 
         return tenantRepository.findAll().stream().map(this::convert).collect(Collectors.toList());