diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index a447b73d4..e2ce367a9 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -613,6 +613,9 @@ public final class LinphoneUtils {
 				}
 
 				// TODO handle non-primary volumes
+			}// Docs storage
+			else if ("com.google.android.apps.docs.storage".equals(uri.getAuthority())) {
+				//Google doc not supported right now
 			}
 			// DownloadsProvider
 			else if ("com.android.providers.downloads.documents".equals(uri.getAuthority())) {
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 3386b1e62..265670115 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -454,6 +454,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	}
 
 	private void addFileToPendingList(String path) {
+		if (path == null) {
+			Log.e("Can't add file to pending list because it's path is null...");
+			return;
+		}
+
 		View pendingFile = mInflater.inflate(R.layout.file_upload_cell, mFilesUploadLayout, false);
 		pendingFile.setTag(path);
 
@@ -480,6 +485,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	}
 
 	private void addImageToPendingList(String path) {
+		if (path == null) {
+			Log.e("Can't add image to pending list because it's path is null...");
+			return;
+		}
+
 		View pendingImage = mInflater.inflate(R.layout.image_upload_cell, mFilesUploadLayout, false);
 		pendingImage.setTag(path);