diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
index 7e1c95efda..bc52a5204f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
@@ -272,15 +272,22 @@ public class DeviceManagementServiceComponent {
      * @param deviceManagementService An instance of DeviceManagementService
      */
     protected void setDeviceManagementService(DeviceManagementService deviceManagementService) {
-        if (log.isDebugEnabled()) {
-            log.debug("Setting Device Management Service Provider: '" +
-                    deviceManagementService.getType() + "'");
-        }
-        synchronized (LOCK) {
-            deviceManagers.add(deviceManagementService);
-            for (PluginInitializationListener listener : listeners) {
-                listener.registerDeviceManagementService(deviceManagementService);
+        try {
+            if (log.isDebugEnabled()) {
+                log.debug("Setting Device Management Service Provider: '" +
+                                  deviceManagementService.getType() + "'");
             }
+            synchronized (LOCK) {
+                deviceManagers.add(deviceManagementService);
+                for (PluginInitializationListener listener : listeners) {
+                    listener.registerDeviceManagementService(deviceManagementService);
+                }
+            }
+            log.info("Device Type deployed successfully : " + deviceManagementService.getType() + " for tenant "
+                             + deviceManagementService.getProvisioningConfig().getProviderTenantDomain());
+        } catch (Throwable e) {
+            log.error("Failed to register device management service for device type" + deviceManagementService.getType() +
+                            " for tenant " + deviceManagementService.getProvisioningConfig().getProviderTenantDomain(), e);
         }
     }