diff --git a/res/drawable/next_arrow.png b/res/drawable/next_arrow.png
new file mode 100644
index 0000000..1ff3819
Binary files /dev/null and b/res/drawable/next_arrow.png differ
diff --git a/res/layout/fragment_mainactivity_gotosettings.xml b/res/layout/fragment_mainactivity_gotosettings.xml
index bd6ed3d..8d7a839 100644
--- a/res/layout/fragment_mainactivity_gotosettings.xml
+++ b/res/layout/fragment_mainactivity_gotosettings.xml
@@ -80,4 +80,14 @@
         style="@style/StandardButton"
         android:text="@string/ma_button_goto_settings" />
 
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/textView1"
+        android:layout_alignStart="@+id/textView1"
+        android:layout_below="@+id/main_button_settings"
+        android:layout_marginTop="33dp"
+        android:src="@drawable/next_arrow" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_mainactivity_main.xml b/res/layout/fragment_mainactivity_main.xml
index d8f5baa..6f56eb6 100644
--- a/res/layout/fragment_mainactivity_main.xml
+++ b/res/layout/fragment_mainactivity_main.xml
@@ -60,4 +60,14 @@
         android:text="@string/ma_content_welcome"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:maxHeight="@dimen/arrow_max_height"
+        android:src="@drawable/next_arrow" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 55c1e59..2bfd437 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -3,5 +3,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="arrow_max_height">22dp</dimen>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6276418..2b980da 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,7 +28,7 @@
 <resources>
 
     <!-- Translation version, reference for translators -->
-    <string name="translation_version">4</string>
+    <string name="translation_version">5</string>
 
     <!-- System strings, do not translate -->
     <string name="app_name">ownCloud-SMS</string>
@@ -151,6 +151,7 @@ Contributors and issue\'s reporters</string>
     <string name="err_sync_http_request_resp">Error #14: Unable to parse server response</string>
     <string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
     <string name="err_sync_no_connection_available">Error #16: No data connection available</string>
+    <string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
     <string name="title_activity_main">MainActivity</string>
     <string name="title_section1">Section 1</string>
     <string name="title_section2">Section 2</string>
diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
index b107bb0..9972ed3 100644
--- a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
+++ b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
@@ -17,6 +17,7 @@ package fr.unix_experience.owncloud_sms.sync_adapters;
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import fr.unix_experience.owncloud_sms.R;
 import fr.unix_experience.owncloud_sms.engine.OCSMSOwnCloudClient;
 import fr.unix_experience.owncloud_sms.enums.OCSyncErrorType;
 import fr.unix_experience.owncloud_sms.exceptions.OCSyncException;
@@ -43,10 +44,16 @@ public class SmsSyncAdapter extends AbstractThreadedSyncAdapter {
 			ContentProviderClient provider, SyncResult syncResult) {
 		
 		OCSMSNotificationManager nMgr = new OCSMSNotificationManager(getContext());
-		nMgr.setSyncProcessMsg();
 		
 		// Create client
-		Uri serverURI = Uri.parse(_accountMgr.getUserData(account, "ocURI"));
+		String ocURI = _accountMgr.getUserData(account, "ocURI");
+		if (ocURI == null) {
+			nMgr.setSyncErrorMsg(getContext().getString(R.string.err_sync_account_unparsable));
+			return;
+		}
+		
+		Uri serverURI = Uri.parse(ocURI);
+		nMgr.setSyncProcessMsg();		
 		
 		OCSMSOwnCloudClient _client = new OCSMSOwnCloudClient(getContext(),
 				serverURI, _accountMgr.getUserData(account, "ocLogin"),