diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
index 119a452179..73b3d9835e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
@@ -121,7 +121,7 @@ public class AndroidDeviceManager implements DeviceManager {
 						new StringReader(new String((byte[]) resource.getContent(), Charset.
 								forName(MobilePluginConstants.CHARSET_UTF8))));
 			}
-			return new TenantConfiguration();
+			return null;
 		} catch (MobileDeviceMgtPluginException e) {
 			throw new DeviceManagementException(
 					"Error occurred while retrieving the Registry instance : " + e.getMessage(), e);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java
index 906bf7f74c..c3c1362c30 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java
@@ -113,11 +113,14 @@ public class WindowsDeviceManager implements DeviceManager {
                     MobileDeviceManagementUtil.getPlatformConfigPath(DeviceManagementConstants.
                             MobileDeviceTypes.MOBILE_DEVICE_TYPE_WINDOWS);
             resource = MobileDeviceManagementUtil.getRegistryResource(windowsTenantRegistryPath);
-            JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
-            Unmarshaller unmarshaller = context.createUnmarshaller();
-            return (TenantConfiguration) unmarshaller.unmarshal(
-                    new StringReader(new String((byte[]) resource.getContent(), Charset
-                            .forName(MobilePluginConstants.CHARSET_UTF8))));
+            if(resource != null){
+                JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
+                Unmarshaller unmarshaller = context.createUnmarshaller();
+                return (TenantConfiguration) unmarshaller.unmarshal(
+                        new StringReader(new String((byte[]) resource.getContent(), Charset.
+                                                                         forName(MobilePluginConstants.CHARSET_UTF8))));
+            }
+            return null;
         } catch (MobileDeviceMgtPluginException e) {
             throw new DeviceManagementException(
                     "Error occurred while retrieving the Registry instance : " + e.getMessage(), e);