diff --git a/lib/diaspora/user/connecting.rb b/lib/diaspora/user/connecting.rb
index 89f3fb9ab..33783eea6 100644
--- a/lib/diaspora/user/connecting.rb
+++ b/lib/diaspora/user/connecting.rb
@@ -64,13 +64,15 @@ module Diaspora
 
           #this is a new contact request
         elsif !request_from_me?(contact_request)
-          self.pending_requests << contact_request
-          self.save!
-          Rails.logger.info("#{self.real_name} has received a contact request")
-          contact_request.save
-          Request.send_new_request(self, contact_request.from)
+          if contact_request.save!
+            self.pending_requests << contact_request
+            self.save!
+            Rails.logger.info("#{self.real_name} has received a contact request")
+            Request.send_new_request(self, contact_request.from)
+          end
         else
-          raise "#{self.real_name} is trying to receive a contact request from himself."
+          Rails.logger.info "#{self.real_name} is trying to receive a contact request from himself."
+          return nil
         end
         contact_request
       end
diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index 068b3b907..182ba473e 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -89,7 +89,7 @@ module Diaspora
       end
 
       def receive_request request, person
-        request.save!
+        Rails.logger.info("event=receive payload_type=request sender=#{request.from} to=#{request.to}")
         receive_contact_request(request)
       end
 
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index c8ed0fa69..bc991d60e 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -29,12 +29,6 @@ describe SocketsController do
       @fixture_name = File.dirname(__FILE__) + '/../fixtures/button.png'
     end
 
-    it 'should actionhash photos' do
-      photo = @user.post(:photo, :album_id => nil, :to => @aspect.id, :user_file => File.open(@fixture_name))
-      json  = @controller.action_hash(@user.id, photo, :aspect_ids => :all)
-      json.include?('photo').should be_true
-    end
-
     it 'should actionhash posts' do
       json = @controller.action_hash(@user.id, @message)
       json.include?(@message.message).should be_true
diff --git a/spec/helpers/sockets_helper_spec.rb b/spec/helpers/sockets_helper_spec.rb
index bb65f4ccd..4d93f00e6 100644
--- a/spec/helpers/sockets_helper_spec.rb
+++ b/spec/helpers/sockets_helper_spec.rb
@@ -5,9 +5,4 @@
 require 'spec_helper'
 
 describe SocketsHelper do
-  
-  describe '#obj_id' do
-
-  end
-
 end
diff --git a/spec/models/user/connecting_spec.rb b/spec/models/user/connecting_spec.rb
index 4cf0b0266..2584f4fdd 100644
--- a/spec/models/user/connecting_spec.rb
+++ b/spec/models/user/connecting_spec.rb
@@ -32,7 +32,6 @@ describe Diaspora::UserModules::Connecting do
     describe  '#receive_contact_request' do
       it 'adds a request to pending if it was not sent by user' do
         r = Request.instantiate(:to => user.person, :from => person)
-        r.save
         user.receive_contact_request(r)
         user.reload.pending_requests.should include r
       end
@@ -91,8 +90,8 @@ describe Diaspora::UserModules::Connecting do
       it 'should ignore a contact request from yourself' do
         reversed_request = request_from_myself.reverse_for(user)
 
-        proc { user.receive_contact_request(reversed_request)
-          }.should raise_error /request from himself/
+        user.receive_contact_request(reversed_request)
+        reversed_request.persisted?.should be false
       end
     end
 
@@ -101,7 +100,7 @@ describe Diaspora::UserModules::Connecting do
       proc { user.send_contact_request_to(user2.person, aspect1) 
       }.should raise_error(MongoMapper::DocumentNotValid, /already connected/)
     end
-
+    
     it 'should not be able to contact request no-one' do
       proc { user.send_contact_request_to(nil, aspect) 
       }.should raise_error(MongoMapper::DocumentNotValid)