diff --git a/src/acr/browser/lightning/BookmarkManager.java b/src/acr/browser/lightning/BookmarkManager.java
index d6de8f5..9904000 100644
--- a/src/acr/browser/lightning/BookmarkManager.java
+++ b/src/acr/browser/lightning/BookmarkManager.java
@@ -429,10 +429,8 @@ public class BookmarkManager {
 	private class SortIgnoreCase implements Comparator<HistoryItem> {
 
 		public int compare(HistoryItem o1, HistoryItem o2) {
-			if (o1 == null || o2 == null) {
+			if (o1 == null || o2 == null || o1.getTitle() == null || o2.getTitle() == null) {
 				return 0;
-			} else if (o1.getTitle() == null || o2.getTitle() == null) {
-				return o1.getTitle().compareTo(o2.getTitle());
 			}
 			return o1.getTitle().toLowerCase(Locale.getDefault())
 					.compareTo(o2.getTitle().toLowerCase(Locale.getDefault()));
diff --git a/src/acr/browser/lightning/HistoryItem.java b/src/acr/browser/lightning/HistoryItem.java
index eb891a9..2b5c770 100644
--- a/src/acr/browser/lightning/HistoryItem.java
+++ b/src/acr/browser/lightning/HistoryItem.java
@@ -67,7 +67,7 @@ public class HistoryItem implements Comparable<HistoryItem> {
 	}
 
 	public void setFolder(String folder) {
-		mFolder = folder;
+		mFolder = (folder == null) ? "" : folder;
 	}
 
 	public void setOrder(int order) {
@@ -93,7 +93,7 @@ public class HistoryItem implements Comparable<HistoryItem> {
 
 	// setting name
 	public void setUrl(String url) {
-		this.mUrl = url;
+		this.mUrl = (url == null) ? "" : url;
 	}
 
 	// getting phone number
@@ -103,7 +103,7 @@ public class HistoryItem implements Comparable<HistoryItem> {
 
 	// setting phone number
 	public void setTitle(String title) {
-		this.mTitle = title;
+		this.mTitle = (title == null) ? "" : title;
 	}
 
 	@Override