From fce9b60de962db974fc44ae0e8a9aae5d49bf7dd Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Apr 2016 14:15:28 +0200
Subject: [PATCH] Another fix

---
 src/org/linphone/LinphoneContact.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 6efda5d61..66a2920f5 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -440,8 +440,10 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 	
 	@Override
 	public int compareTo(LinphoneContact contact) {
-		String firstLetter = getFullName().substring(0, 1).toUpperCase(Locale.getDefault());
-		String contactfirstLetter = contact.getFullName().substring(0, 1).toUpperCase(Locale.getDefault());
+		String fullName = getFullName();
+		String contactFullName = contact.getFullName();
+		String firstLetter = fullName == null || fullName.isEmpty() ? "" : fullName.substring(0, 1).toUpperCase(Locale.getDefault());
+		String contactfirstLetter = contactFullName == null || contactFullName.isEmpty() ? "" : contactFullName.substring(0, 1).toUpperCase(Locale.getDefault());
 		return firstLetter.compareTo(contactfirstLetter);
 	}