diff --git a/lib/em-webfinger.rb b/lib/em-webfinger.rb
index 8c48478e5..6db2cbce2 100644
--- a/lib/em-webfinger.rb
+++ b/lib/em-webfinger.rb
@@ -98,7 +98,6 @@ class EMWebfinger
         c.call(person)
       rescue Exception => e
         Rails.logger.info("event=EMWebfinger status=error_on_callback error='#{e.inspect}'")
-        raise e
       end
     }
     Rails.logger.info("event=EMWebfinger status=complete target=#{@account}")
diff --git a/spec/controllers/status_message_controller_spec.rb b/spec/controllers/status_message_controller_spec.rb
index 5f863d30e..4c3e361af 100644
--- a/spec/controllers/status_message_controller_spec.rb
+++ b/spec/controllers/status_message_controller_spec.rb
@@ -19,7 +19,7 @@ describe StatusMessagesController do
     sign_in :user, user
     @controller.stub!(:current_user).and_return(user)
 
-    EM.stub!(:next_tick).with(&block).and_return{|x| x.call}
+    EM.stub!(:next_tick).and_yield(:block)
   end
 
   describe '#show' do