diff --git a/java/code/src/com/suse/manager/utils/SaltUtils.java b/java/code/src/com/suse/manager/utils/SaltUtils.java
index 5dbb7a3bdfaf..0fdd9c830baf 100644
--- a/java/code/src/com/suse/manager/utils/SaltUtils.java
+++ b/java/code/src/com/suse/manager/utils/SaltUtils.java
@@ -912,20 +912,19 @@ private String parseDryRunMessage(JsonElement jsonResult) {
             DistUpgradeDryRunSlsResult distUpgradeSlsResult = Json.GSON.fromJson(
                     jsonResult, DistUpgradeDryRunSlsResult.class);
             if (distUpgradeSlsResult.getSpmigration() != null) {
-                return distUpgradeSlsResult.getSpmigration()
-                        .getChanges().getRetOpt()
-                        .orElse("") + " " + distUpgradeSlsResult
-                        .getSpmigration().getComment();
+                return String.join(" ",
+                                   distUpgradeSlsResult.getSpmigration().getChanges().getRetOpt().orElse(""),
+                                   distUpgradeSlsResult.getSpmigration().getComment());
             }
         }
         catch (JsonSyntaxException e) {
             try {
                 DistUpgradeOldSlsResult distUpgradeSlsResult = Json.GSON.fromJson(
                         jsonResult, DistUpgradeOldSlsResult.class);
-                return distUpgradeSlsResult.getSpmigration()
-                        .getChanges().getRetOpt().map(ModuleRun::getComment)
-                        .orElse("") + " " + distUpgradeSlsResult
-                        .getSpmigration().getComment();
+                return String.join(" ",
+                                   distUpgradeSlsResult.getSpmigration().getChanges().getRetOpt()
+                                           .map(ModuleRun::getComment).orElse(""),
+                                   distUpgradeSlsResult.getSpmigration().getComment());
             }
             catch (JsonSyntaxException ex) {
                 LOG.error("Unable to parse dry run result", ex);