1 files changed, 9 insertions, 3 deletions
diff --git a/lib/nickserver/request_handlers/invalid_email_handler.rb b/lib/nickserver/request_handlers/invalid_email_handler.rb
index eaf8156..bb98f65 100644
--- a/lib/nickserver/request_handlers/invalid_email_handler.rb
+++ b/lib/nickserver/request_handlers/invalid_email_handler.rb
@@ -1,15 +1,21 @@
+require 'nickserver/request_handlers/base'
 require 'nickserver/email_address'
 require 'nickserver/error_response'
 
 module Nickserver
   module RequestHandlers
-    class InvalidEmailHandler
-      def call(request)
+    class InvalidEmailHandler < Base
+
+      def handle
         return unless request.email
-        email = EmailAddress.new(request.email)
         ErrorResponse.new("Not a valid address") if email.invalid?
       end
 
+      protected
+
+      def email
+        @email ||= EmailAddress.new(request.email)
+      end
     end
   end
 end