diff --git a/ChangeLog b/ChangeLog
index 34a900d49..2f26a9e25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:):
+	make sure the value of column pointer to by _kindField is not nil,
+	nor an NSNull instance before treating it like a string.
+
 2012-02-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoSQLUserProfile.m (-fetchJSONProfileFromDB):
diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m
index 59bdf969e..ebdc229c0 100644
--- a/SoObjects/SOGo/SQLSource.m
+++ b/SoObjects/SOGo/SQLSource.m
@@ -552,7 +552,7 @@
 	  // We check if it's a resource of not
 	  if (_kindField)
 	    {	      
-	      if ((value = [response objectForKey: _kindField]))
+	      if ((value = [response objectForKey: _kindField]) && [value isNotNull])
 		{
 		  if ([value caseInsensitiveCompare: @"location"] == NSOrderedSame ||
 		      [value caseInsensitiveCompare: @"thing"] == NSOrderedSame ||