From 76a442e864f43b77dc6b4d1ad7e285a276a77335 Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Wed, 17 Aug 2016 15:54:56 +0530
Subject: [PATCH] Fix for possible NPE that could happen due to null device or
 null property list.

---
 .../mgt/mobile/util/MobileDeviceManagementUtil.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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..b70019f3e0 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,11 +73,13 @@ 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;
 	}