diff --git a/lib/travis/services/find_repo_settings.rb b/lib/travis/services/find_repo_settings.rb
index <HASH>..<HASH> 100644
--- a/lib/travis/services/find_repo_settings.rb
+++ b/lib/travis/services/find_repo_settings.rb
@@ -4,7 +4,7 @@ module Travis
       register :find_repo_settings
 
       def run(options = {})
-        result if authorized?
+        result if repo && authorized?
       end
 
       def updated_at
diff --git a/spec/travis/services/find_repo_settings_spec.rb b/spec/travis/services/find_repo_settings_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/travis/services/find_repo_settings_spec.rb
+++ b/spec/travis/services/find_repo_settings_spec.rb
@@ -22,6 +22,11 @@ describe Travis::Services::FindRepoSettings do
   end
 
   describe 'run' do
+    it 'should return nil without a repo' do
+      repo.destroy
+      service.run.should be_nil
+    end
+
     it 'should return repo settings' do
       user.permissions.create(repository_id: repo.id, push: true)
       service.run.to_hash.should == Repository::Settings.defaults.deep_merge({ 'foo' => 'bar' })
Return nil from find_repo_settings service if repo can't be find