diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index 7a1a111ee..b96b6d755 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -83,9 +83,11 @@ module Diaspora
         request.person.save
         old_request =  Request.first(:id => request.id)
         Rails.logger.info("I got a reqest_id #{request.id} with old request #{old_request.inspect}")
-        request.aspect_id = old_request.aspect_id if old_request
-        request.save
-        receive_friend_request(request)
+        if old_request
+          request.aspect_id = old_request.aspect_id if old_request
+          request.save
+          receive_friend_request(request)
+        end
       end
 
       def receive_profile profile, xml