diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java
index 1b59cd4a9a..3f3340c1f3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java
@@ -35,12 +35,12 @@ public class DeviceManagementRepository {
 
     public void addDeviceManagementProvider(DeviceManagerService provider) {
         String deviceType = provider.getProviderType();
+        providers.put(deviceType, provider);
         try {
             DeviceManagerUtil.registerDeviceType(deviceType);
         } catch (DeviceManagementException e) {
             log.error("Exception occured while registering the device type.",e);
         }
-        providers.put(deviceType, provider);
     }
 
     public DeviceManagerService getDeviceManagementProvider(String type) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
index 94da96c419..ab71bdc5ca 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
@@ -51,7 +51,7 @@ public final class DeviceManagerUtil {
     }
 
     /**
-     * Resolve data source from the data source definition
+     * Resolve data source from the data source definition.
      *
      * @param config data source configuration
      * @return data source resolved from the data source definition
@@ -84,6 +84,12 @@ public final class DeviceManagerUtil {
         return dataSource;
     }
 
+    /**
+     * Adds a new device type to the database if it does not exists.
+     *
+     * @param deviceTypeName device type
+     * @return status of the operation
+     */
     public static boolean registerDeviceType(String deviceTypeName) throws DeviceManagementException{
         boolean status = false;
         try {