diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
index d23bab34b4..e97c0cb0da 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
@@ -73,9 +73,11 @@ public class MobileDeviceManagementUtil {
 	}
 
 	private static String getPropertyValue(Device device, String property) {
-		for (Device.Property prop : device.getProperties()) {
-			if (property.equals(prop.getName())) {
-				return prop.getValue();
+		if (device != null && device.getProperties() != null) {
+			for (Device.Property prop : device.getProperties()) {
+				if (property.equals(prop.getName())) {
+					return prop.getValue();
+				}
 			}
 		}
 		return null;