1 files changed, 9 insertions, 1 deletions
diff --git a/app/services/import/github/gists_import_service.rb b/app/services/import/github/gists_import_service.rb
index df1bbe306e7..e57430916fa 100644
--- a/app/services/import/github/gists_import_service.rb
+++ b/app/services/import/github/gists_import_service.rb
@@ -3,16 +3,20 @@
 module Import
   module Github
     class GistsImportService < ::BaseService
-      def initialize(user, params)
+      def initialize(user, client, params)
         @current_user = user
         @params = params
+        @client = client
       end
 
       def execute
         return error('Import already in progress', 422) if import_status.started?
 
+        check_user_token
         start_import
         success
+      rescue Octokit::Unauthorized
+        error('Access denied to the GitHub account.', 401)
       end
 
       private
@@ -29,6 +33,10 @@ module Import
         Gitlab::GithubGistsImport::StartImportWorker.perform_async(current_user.id, encrypted_token)
         import_status.start!
       end
+
+      def check_user_token
+        @client.octokit.user.present?
+      end
     end
   end
 end