diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
index e4996c0e4d..545de690a4 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java
@@ -149,16 +149,18 @@ public class AndroidDeviceManager implements DeviceManager {
     @Override
     public boolean enrollDevice(Device device) throws DeviceManagementException {
         boolean status = false;
-        MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
+        boolean isEnrolled = this.isEnrolled(
+                new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
+
         try {
             if (log.isDebugEnabled()) {
                 log.debug("Enrolling a new Android device : " + device.getDeviceIdentifier());
             }
-            boolean isEnrolled = this.isEnrolled(
-                    new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
+
             if (isEnrolled) {
                 this.modifyEnrollment(device);
             } else {
+                MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
                 AndroidDAOFactory.beginTransaction();
                 status = daoFactory.getMobileDeviceDAO().addMobileDevice(mobileDevice);
                 AndroidDAOFactory.commitTransaction();
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java
index 0d831901dd..1c72d858b9 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/dao/impl/AndroidDeviceDAOImpl.java
@@ -116,7 +116,7 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
 			stmt.setString(5, mobileDevice.getVendor());
 			stmt.setString(6, mobileDevice.getMobileDeviceId());
 			stmt.setString(7, properties.get(AndroidPluginConstants.DEVICE_NAME));
-			stmt.setString(8, mobileDevice.getLongitude());
+			stmt.setString(8, mobileDevice.getLatitude());
 			stmt.setString(9, mobileDevice.getLongitude());
 			stmt.setString(10, mobileDevice.getImei());
 			stmt.setString(11, mobileDevice.getImsi());
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
index 472589e6cb..e56b4f7688 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
@@ -143,16 +143,18 @@ public class AndroidDeviceManager implements DeviceManager {
     @Override
     public boolean enrollDevice(Device device) throws DeviceManagementException {
         boolean status = false;
-        MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
+        boolean isEnrolled = this.isEnrolled(
+                new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
+
         try {
             if (log.isDebugEnabled()) {
                 log.debug("Enrolling a new Android device : " + device.getDeviceIdentifier());
             }
-            boolean isEnrolled = this.isEnrolled(
-                    new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
+
             if (isEnrolled) {
                 this.modifyEnrollment(device);
             } else {
+                MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
                 AndroidDAOFactory.beginTransaction();
                 status = daoFactory.getMobileDeviceDAO().addMobileDevice(mobileDevice);
                 AndroidDAOFactory.commitTransaction();
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java
index a43fcab9dc..84ad8512e0 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java
@@ -116,7 +116,7 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
 			stmt.setString(5, mobileDevice.getVendor());
 			stmt.setString(6, mobileDevice.getMobileDeviceId());
 			stmt.setString(7, properties.get(AndroidPluginConstants.DEVICE_NAME));
-			stmt.setString(8, mobileDevice.getLongitude());
+			stmt.setString(8, mobileDevice.getLatitude());
 			stmt.setString(9, mobileDevice.getLongitude());
 			stmt.setString(10, mobileDevice.getImei());
 			stmt.setString(11, mobileDevice.getImsi());