diff --git a/app/models/person.rb b/app/models/person.rb
index ac4a5dfa7..1e2a7b18d 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -89,6 +89,8 @@ class Person
         f = Redfinger.finger(identifier)
        rescue SocketError => e
          raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/
+       rescue Errno::ETIMEDOUT => e
+         raise "Connection timed out to Diaspora server for #{identifier}"
        end
        raise "No webfinger profile found at #{identifier}" if f.nil? || f.links.empty?
        Person.from_webfinger_profile(identifier, f )