Fix regression introduced last week

src/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
+if(POLICY CMP0022)
+   cmake_policy(SET CMP0022 NEW)
+endif(POLICY CMP0022)
+
 INCLUDE(GNUInstallDirs)
 
 ADD_DEFINITIONS("-std=c++0x")

src/contactmodel.cpp

@@ -236,9 +236,12 @@ bool ContactModel::addContact(Contact* c)
 
    //Deprecate the placeholder
    if (m_hPlaceholders.contains(c->uid())) {
-      m_hPlaceholders[c->uid()]->merge(c);
+      Contact* c2 = m_hPlaceholders[c->uid()];
+      if (c2) {
+         c2->merge(c);
          m_hPlaceholders[c->uid()] = nullptr;
       }
+   }
    endInsertRows();
    emit layoutChanged();
    emit newContactAdded(c);