diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
index 0ee091ce2a..6db5d88054 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java
@@ -32,6 +32,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
+import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.ConfigProperties;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Property;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.PushNotificationProvider;
@@ -113,11 +114,13 @@ public class DeviceTypeManagerService implements DeviceManagementService {
         if (pushNotificationProvider != null) {
             if (pushNotificationProvider.isFileBasedProperties()) {
                 Map<String, String> staticProps = new HashMap<>();
-                if (pushNotificationProvider.getConfigProperties() != null &&
-                        pushNotificationProvider.getConfigProperties().getProperty() != null &&
-                        pushNotificationProvider.getConfigProperties().getProperty().size() > 0) {
-                    for (Property property : pushNotificationProvider.getConfigProperties().getProperty()) {
-                        staticProps.put(property.getName(), property.getValue());
+                ConfigProperties configProperties = pushNotificationProvider.getConfigProperties();
+                if (configProperties != null) {
+                    List<Property> properties = configProperties.getProperty();
+                    if (properties != null && properties.size() > 0) {
+                        for (Property property : properties) {
+                            staticProps.put(property.getName(), property.getValue());
+                        }
                     }
                 }
                 pushNotificationConfig = new PushNotificationConfig(pushNotificationProvider.getType(),
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 083b795a9d..13a5547687 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -2121,17 +2121,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                     operation.setType(Operation.Type.COMMAND);
                     operation.setCode(str);
                     try {
-                        deviceManagementProviderService.
-                                addOperation(deviceType,
-                                             operation, deviceIdentifiers);
+                        deviceManagementProviderService.addOperation(deviceType, operation, deviceIdentifiers);
                     } catch (OperationManagementException e) {
-                        throw new DeviceManagementException(
-                                "Unable to find the device with the id: '" + deviceIdentifier.getId(),
-                                e);
+                        throw new DeviceManagementException("Unable to add the operation for the device with the id: '"
+                                                                    + deviceIdentifier.getId(), e);
                     } catch (InvalidDeviceException e) {
-                        throw new DeviceManagementException(
-                                "Unable to find the device with the id: '" + deviceIdentifier.getId(),
-                                e);
+                        throw new DeviceManagementException("Unable to find the device with the id: '"
+                                                                    + deviceIdentifier.getId(), e);
                     }
                 }
             }