diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb
index f57f5b747066d78baf5755f07bab797486c8ce32..f2e220fcb3ea0df674c8f9c3525da618044ecd0f 100644
--- a/lib/gitlab/github_import/client.rb
+++ b/lib/gitlab/github_import/client.rb
@@ -82,11 +82,15 @@ module Gitlab
       # disabled. In this case we just want to return gracefully
       # instead of spitting out an error.
       rescue Octokit::NotFound
-        OpenStruct.new(remaining: GITHUB_SAFE_REMAINING_REQUESTS + 1)
+        nil
+      end
+
+      def has_rate_limit?
+        rate_limit.present?
       end
 
       def rate_limit_exceed?
-        rate_limit.remaining <= GITHUB_SAFE_REMAINING_REQUESTS
+        has_rate_limit? && rate_limit.remaining <= GITHUB_SAFE_REMAINING_REQUESTS
       end
 
       def rate_limit_sleep_time