diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index ad53d41cd..981d6028f 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -42,7 +42,8 @@ module Diaspora
       end
 
       def contact_for_person_id(person_id)
-        friends(:person_id => person_id).first
+        friends.first(:person_id => person_id.to_id) if person_id
+
       end
 
       def friends_not_in_aspect( aspect )