1 files changed, 7 insertions, 5 deletions
diff --git a/lib/nickserver/request_handlers/hkp_email_handler.rb b/lib/nickserver/request_handlers/hkp_email_handler.rb
index 799e138..2f73773 100644
--- a/lib/nickserver/request_handlers/hkp_email_handler.rb
+++ b/lib/nickserver/request_handlers/hkp_email_handler.rb
@@ -3,16 +3,18 @@ require 'nickserver/hkp/source'
 
 module Nickserver
   module RequestHandlers
-    class HkpEmailHandler
+    class HkpEmailHandler < Base
 
-      def call(request)
-        return unless request.email
-        email = EmailAddress.new(request.email)
-        source.query(email)
+      def handle
+        source.query(email) if request.email
       end
 
       protected
 
+      def email
+        @email ||= EmailAddress.new(request.email)
+      end
+
       def source
         Nickserver::Hkp::Source.new
       end