diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
index 45c3e64a3..c988a4b69 100644
--- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryServiceImpl.java
@@ -476,6 +476,10 @@ else if (logger.isInfoEnabled())
     private static List<String> getCSVs(String str)
     {
         List<String> result = new LinkedList<String>();
+
+        if(str == null)
+            return result;
+
         StringTokenizer toks = new StringTokenizer(str, DELIM);
         while(toks.hasMoreTokens())
         {
diff --git a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
index 3080cf966..061d45588 100644
--- a/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
+++ b/src/net/java/sip/communicator/impl/history/HistoryReaderImpl.java
@@ -217,9 +217,11 @@ public synchronized QueryResultSet<HistoryRecord> findLast(int count) throws Run
                         // Get nested TEXT node's value
                         Node nodeValue = propertyNode.getFirstChild();
 
+                        if(nodeValue == null)
+                            continue;
+
                         nameVals.add(propertyNode.getNodeName());
-                        nameVals.add(nodeValue == null ?
-                                null : nodeValue.getNodeValue());
+                        nameVals.add(nodeValue.getNodeValue());
                     }
                 }