Merge the places where exceptions could be raised

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb
index 7e3506bbd3f..bfc56cb17ff 100644
--- a/lib/gitlab/email/handler/create_issue_handler.rb
+++ b/lib/gitlab/email/handler/create_issue_handler.rb
@@ -14,10 +14,11 @@ module Gitlab
         end
 
         def can_handle?
-          !!(project_namespace && project)
+          !!authentication_token
         end
 
         def execute
+          raise ProjectNotFound unless project
           validate_permission!(:create_issue)
 
           verify_record!(
diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb
index b91dd623161..2ae3bf23a74 100644
--- a/lib/gitlab/email/handler/create_note_handler.rb
+++ b/lib/gitlab/email/handler/create_note_handler.rb
@@ -6,7 +6,8 @@ module Gitlab
     module Handler
       class CreateNoteHandler < BaseHandler
         def can_handle?
-          !!(mail_key && sent_notification)
+          # We want to raise SentNotificationNotFoundError for missing key
+          !!(mail_key.nil? || mail_key =~ /\A\w+\z/)
         end
 
         def execute