diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
index 239964b89..256a04926 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
@@ -342,33 +342,23 @@ public class DistributionAddUpdateWindowLayout extends VerticalLayout {
         distributionSet.setRequiredMigrationStep(isMigStepReq);
     }
 
-    /**
-     * Duplicate check-Name and version for {@link DistributionSet} unique.
-     *
-     * @param name
-     *            as String
-     * @param version
-     *            as String
-     * @return
-     */
     private boolean duplicateCheck(final String name, final String version) {
         final DistributionSet existingDs = distributionSetManagement.findDistributionSetByNameAndVersion(name, version);
-        /*
-         * Distribution should not exists with the same name & version. Display
-         * error message, when the "existingDs" is not null and it is add window
-         * (or) when the "existingDs" is not null and it is edit window and the
-         * distribution Id of the edit window is different then the "existingDs"
-         */
-        if (existingDs != null && (!editDistribution || editDistribution && !existingDs.getId().equals(editDistId))) {
-            distNameTextField.addStyleName("v-textfield-error");
-            distVersionTextField.addStyleName("v-textfield-error");
-            notificationMessage.displayValidationError(
-                    i18n.get("message.duplicate.dist", new Object[] { existingDs.getName(), existingDs.getVersion() }));
 
-            return false;
-        } else {
+        if (existingDs == null) {
             return true;
         }
+
+        if (editDistribution && !existingDs.getId().equals(editDistId)) {
+            return true;
+        }
+
+        distNameTextField.addStyleName("v-textfield-error");
+        distVersionTextField.addStyleName("v-textfield-error");
+        notificationMessage.displayValidationError(
+                i18n.get("message.duplicate.dist", new Object[] { existingDs.getName(), existingDs.getVersion() }));
+
+        return false;
     }
 
     /**
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
index e375e078c..47336dd34 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
@@ -20,6 +20,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hawkbit.im.authentication.UserPrincipal;
 import org.eclipse.hawkbit.repository.SoftwareManagement;
 import org.eclipse.hawkbit.repository.model.DistributionSetIdName;
@@ -437,13 +438,16 @@ public final class HawkbitCommonUtil {
      * @return String formatted text
      */
     public static String getFormattedText(final String orgText) {
-        String formtdTxt = orgText == null ? "" : orgText;
-        final int txtLengthAllowed = SPUIDefinitions.NAME_DESCRIPTION_LENGTH;
-        if (formtdTxt.length() > txtLengthAllowed) {
-            formtdTxt = new StringBuilder(orgText.substring(0, txtLengthAllowed)).append("...").toString();
+        if (orgText == null) {
+            return StringUtils.EMPTY;
         }
 
-        return formtdTxt;
+        final int txtLengthAllowed = SPUIDefinitions.NAME_DESCRIPTION_LENGTH;
+        if (orgText.length() > txtLengthAllowed) {
+            return new StringBuilder(orgText.substring(0, txtLengthAllowed)).append("...").toString();
+        }
+
+        return orgText;
     }
 
     /**