diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 98a5a05ed..a96f64df8 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -32,13 +32,11 @@ import org.linphone.core.LinphoneFriend;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.mediastream.Log;
 
-import android.*;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.MatrixCursor;
@@ -162,8 +160,10 @@ public class ContactsManager extends ContentObserver {
 	}
 
 	public boolean hasContactsAccess() {
+		if (context == null)
+			return false;
 		int contacts = context.getPackageManager().checkPermission(android.Manifest.permission.READ_CONTACTS, context.getPackageName());
-		return contacts == PackageManager.PERMISSION_GRANTED && !context.getResources().getBoolean(R.bool.force_use_of_linphone_friends);
+		return contacts == context.getPackageManager().PERMISSION_GRANTED && !context.getResources().getBoolean(R.bool.force_use_of_linphone_friends);
 	}
 
 	public void setLinphoneContactsPrefered(boolean isPrefered) {
diff --git a/submodules/linphone b/submodules/linphone
index 76b6d803b..1f5cf6053 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 76b6d803bc5efff7eb51f846e9806b07a5f2669d
+Subproject commit 1f5cf605310dc96881aa83ff1f74547a70a4dfa4