diff --git a/mifosng-android/gradle/wrapper/gradle-wrapper.jar b/mifosng-android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..f6b961fd5a8
Binary files /dev/null and b/mifosng-android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java
index 58796631828..750f808cfd6 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java
@@ -7,11 +7,14 @@
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
@@ -224,7 +227,15 @@ void onClickActivateClient() {
     }
 
     public void inflateClientInformation() {
-        mClientDetailsPresenter.loadClientDetailsAndClientAccounts(clientId);
+        Context context = getContext();
+        Object systemService = context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager connectivityManager = (ConnectivityManager) systemService;
+        NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+        if (networkInfo != null && networkInfo.isConnected()) {
+            mClientDetailsPresenter.loadClientDetailsAndClientAccounts(clientId);
+            return;
+        }
+        showFetchingError(getString(R.string.device_not_connected_to_internet));
     }
 
     @Override
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.java
index 9de47fb5680..3ff82050925 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.java
@@ -1,7 +1,9 @@
 package com.mifos.mifosxdroid.online.clientdetails;
 
+import com.mifos.App;
 import com.mifos.api.datamanager.DataManagerClient;
 import com.mifos.api.datamanager.DataManagerDataTable;
+import com.mifos.mifosxdroid.R;
 import com.mifos.mifosxdroid.base.BasePresenter;
 import com.mifos.objects.accounts.ClientAccounts;
 import com.mifos.objects.client.Client;
@@ -137,7 +139,8 @@ public void onCompleted() {
                     @Override
                     public void onError(Throwable e) {
                         getMvpView().showProgressbar(false);
-                        getMvpView().showFetchingError("Client not found.");
+                        String msg = App.getContext().getString(R.string.client_not_found);
+                        getMvpView().showFetchingError(msg);
                     }
 
                     @Override
diff --git a/mifosng-android/src/main/res/values-ca/strings.xml b/mifosng-android/src/main/res/values-ca/strings.xml
index c526a86d59a..8d764320382 100755
--- a/mifosng-android/src/main/res/values-ca/strings.xml
+++ b/mifosng-android/src/main/res/values-ca/strings.xml
@@ -155,4 +155,6 @@
     <string name="valid">Vàlid</string>
     <string name="surveyEmpty"> Aquesta enquesta està buida</string>
     <string name="back_again">Appuyez de nouveau sur la touche pour quitter</string>
+    <string name="client_not_found">No s\'ha trobat el client.</string>
+    <string name="device_not_connected_to_internet">Dispositiu no connectat a Internet</string>
 </resources>
diff --git a/mifosng-android/src/main/res/values-en/strings.xml b/mifosng-android/src/main/res/values-en/strings.xml
index a23cd20127d..26a03d4c916 100755
--- a/mifosng-android/src/main/res/values-en/strings.xml
+++ b/mifosng-android/src/main/res/values-en/strings.xml
@@ -187,6 +187,8 @@
     <string name="product_name">Product Name</string>
     <string name="valid">Valid</string>
     <string name="surveyEmpty">This Survey is Empty</string>
+    <string name="client_not_found">Client not found.</string>
+    <string name="device_not_connected_to_internet">Device not connected to internet</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-es/strings.xml b/mifosng-android/src/main/res/values-es/strings.xml
index 1b16d3eb0c1..fb33a8fa753 100755
--- a/mifosng-android/src/main/res/values-es/strings.xml
+++ b/mifosng-android/src/main/res/values-es/strings.xml
@@ -155,4 +155,6 @@
     <string name="valid">Válido</string>
     <string name="surveyEmpty">Esta encuesta está vacía</string>
     <string name="back_again">Vuelva a pulsar para salir</string>
+    <string name="client_not_found">Cliente no encontrado.</string>
+    <string name="device_not_connected_to_internet">Dispositivo no conectado a internet</string>
 </resources>
diff --git a/mifosng-android/src/main/res/values-fr/strings.xml b/mifosng-android/src/main/res/values-fr/strings.xml
index 1e499840c2e..d55fb3d6cc1 100644
--- a/mifosng-android/src/main/res/values-fr/strings.xml
+++ b/mifosng-android/src/main/res/values-fr/strings.xml
@@ -602,4 +602,6 @@
         <item>prêts</item>
         <item>comptes d\'épargne</item>
     </string-array>
+    <string name="client_not_found">Client introuvable.</string>
+    <string name="device_not_connected_to_internet">Appareil non connecté à Internet</string>
 </resources>
diff --git a/mifosng-android/src/main/res/values-hi/strings.xml b/mifosng-android/src/main/res/values-hi/strings.xml
index 5b225646df3..9ec4c6ae29e 100644
--- a/mifosng-android/src/main/res/values-hi/strings.xml
+++ b/mifosng-android/src/main/res/values-hi/strings.xml
@@ -611,5 +611,7 @@
     <string name="collectionsheet_submit_success">कलेक्शन शीट सफलतापूर्वक जमा कर दी गई</string>
     <string name="individual_collection_sheet">व्यक्तिगत कलेक्शन शीट</string>
     <string name="due_collection">कलेक्शन का देय</string>
+    <string name="client_not_found">ग्राहक नहीं मिला।</string>
+    <string name="device_not_connected_to_internet">डिवाइस इंटरनेट से कनेक्ट नहीं है</string>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-kn/strings.xml b/mifosng-android/src/main/res/values-kn/strings.xml
index 17671da1508..f594994eb24 100644
--- a/mifosng-android/src/main/res/values-kn/strings.xml
+++ b/mifosng-android/src/main/res/values-kn/strings.xml
@@ -586,4 +586,6 @@
     <string name="overdue_x_number">ಮಿತಿಮೀರಿದ ಎಕ್ಸ್ ಸಂಖ್ಯೆ</string>
     <string name="overdue_y_number">ಮಿತಿಮೀರಿದ ವೈ ಸಂಖ್ಯೆ</string>
     <string name="error_select_group">ದಯವಿಟ್ಟು ಒಂದು ಗುಂಪನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
+    <string name="client_not_found">ಗ್ರಾಹಕ ಕಂಡುಬಂದಿಲ್ಲ.</string>
+    <string name="device_not_connected_to_internet">ಸಾಧನ ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ</string>
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-sw/strings.xml b/mifosng-android/src/main/res/values-sw/strings.xml
index fc074e12bc8..f3b810a12b9 100644
--- a/mifosng-android/src/main/res/values-sw/strings.xml
+++ b/mifosng-android/src/main/res/values-sw/strings.xml
@@ -722,6 +722,8 @@
     <string name="failed_to_load_db_clients">Upakio wa wateja wa hifadhidata umefeli</string>
     <string name="failed_to_load_db_groups">Upakio wa makundi ya hifadhidata umefeli</string>
     <string name="browse">Vinjari</string>
+    <string name="client_not_found">Mteja hajapatikana.</string>
+    <string name="device_not_connected_to_internet">Kifaa hakijaunganishwa kwenye mtandao</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-zh/strings.xml b/mifosng-android/src/main/res/values-zh/strings.xml
index ce520e20a22..ca046ee788d 100755
--- a/mifosng-android/src/main/res/values-zh/strings.xml
+++ b/mifosng-android/src/main/res/values-zh/strings.xml
@@ -711,6 +711,8 @@
     <string name="incorrect_passcode">密码错误</string>
     <string name="incorrect_passcode_more_than_three">您已经输错三次密码了，请再次尝试</string>
     <string name="error_passcode">密码应该是4位数</string>
+    <string name="client_not_found">找不到客户端。</string>
+    <string name="device_not_connected_to_internet">设备未连接到互联网</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index cd84ec4ac90..2deb6c1d6ab 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -834,5 +834,7 @@
     <string name="something_went_wrong">Something went wrong</string>
     <string name="entry">ENTRY</string>
     <string name="network_issue">Network Issue</string>
+    <string name="client_not_found">Client not found.</string>
+    <string name="device_not_connected_to_internet">Device not connected to internet</string>
 
 </resources>