diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConstraintViolationException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConstraintViolationException.java
index 5150226a0..f7a7660cf 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConstraintViolationException.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConstraintViolationException.java
@@ -8,13 +8,8 @@
  */
 package org.eclipse.hawkbit.repository.exception;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.validation.ConstraintViolation;
-
 import org.eclipse.hawkbit.exception.AbstractServerRtException;
 import org.eclipse.hawkbit.exception.SpServerError;
 
@@ -49,12 +44,10 @@ public class ConstraintViolationException extends AbstractServerRtException {
      * @return message String with proper error information
      */
     public static String getExceptionMessage(final javax.validation.ConstraintViolationException ex) {
-        final Set<ConstraintViolation<?>> violations = ex.getConstraintViolations();
-        final List<String> messages = new ArrayList<>();
-        violations.stream().forEach(
-                violation -> messages.add(violation.getPropertyPath() + MESSAGE_FORMATTER_SEPARATOR + violation.getMessage() + "."));
-
-        return messages.stream().collect(Collectors.joining(MESSAGE_FORMATTER_SEPARATOR));
+        return ex
+                .getConstraintViolations().stream().map(violation -> violation.getPropertyPath()
+                        + MESSAGE_FORMATTER_SEPARATOR + violation.getMessage() + ".")
+                .collect(Collectors.joining(MESSAGE_FORMATTER_SEPARATOR));
     }
 
 }
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_7_0__swmType_maxAssignment_greater_0__H2.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_7_0__swmType_maxAssignment_greater_0__H2.sql
new file mode 100644
index 000000000..f79c9375c
--- /dev/null
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_7_0__swmType_maxAssignment_greater_0__H2.sql
@@ -0,0 +1 @@
+Update sp_software_module_type set max_ds_assignments = 1 where max_ds_assignments < 1;
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_7_0__swmType_maxAssignment_greater_0__MYSQL.sql b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_7_0__swmType_maxAssignment_greater_0__MYSQL.sql
new file mode 100644
index 000000000..f79c9375c
--- /dev/null
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_7_0__swmType_maxAssignment_greater_0__MYSQL.sql
@@ -0,0 +1 @@
+Update sp_software_module_type set max_ds_assignments = 1 where max_ds_assignments < 1;
\ No newline at end of file