diff --git a/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/DmfController.java b/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/DmfController.java
index c610b83de..92bce6082 100644
--- a/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/DmfController.java
+++ b/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/DmfController.java
@@ -42,8 +42,8 @@ public class DmfController {
     // configuration
     private final boolean downloadAuthenticationEnabled;
 
-    @Getter @Setter
-    private volatile Map<String, String> attributes = new HashMap<>();
+    @Getter
+    private final Map<String, String> attributes = new HashMap<>();
 
     @Setter
     private volatile Long currentActionId;
diff --git a/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/amqp/Amqp.java b/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/amqp/Amqp.java
index 60fd163e9..94eab54a4 100644
--- a/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/amqp/Amqp.java
+++ b/hawkbit-sdk/hawkbit-sdk-dmf/src/main/java/org/eclipse/hawkbit/sdk/dmf/amqp/Amqp.java
@@ -54,7 +54,7 @@ public class Amqp {
             try {
                 connectionFactory.getRabbitConnectionFactory().useSslProtocol();
             } catch (NoSuchAlgorithmException | KeyManagementException e) {
-                throw new RuntimeException(e);
+                log.error("Failed to enable ssl ... Reason : ", e);
             }
         }
         connectionFactory.setUsername(