diff --git a/lib/travis/api/v3.rb b/lib/travis/api/v3.rb
index 559fb09c..8c8be745 100644
--- a/lib/travis/api/v3.rb
+++ b/lib/travis/api/v3.rb
@@ -35,9 +35,6 @@ module Travis
       NotImplemented      = ServerError        .create('request not (yet) implemented', status: 501)
       RequestLimitReached = ClientError        .create('request limit reached for resource', status: 429)
       AlreadySyncing      = ClientError        .create('sync already in progress', status: 409)
-      AlreadyStarred      = ClientError        .create('repository is already starred', status: 409)
-      NotStarred          = ClientError        .create('repository is not a starred repository')
-
     end
   end
 end
diff --git a/lib/travis/api/v3/queries/repository.rb b/lib/travis/api/v3/queries/repository.rb
index 65aaa56d..60324719 100644
--- a/lib/travis/api/v3/queries/repository.rb
+++ b/lib/travis/api/v3/queries/repository.rb
@@ -10,15 +10,13 @@ module Travis::API::V3
 
     def star(repository, current_user)
       starred = Models::StarredRepository.where(repository_id: repository.id, user_id: current_user.id).first
-      raise AlreadyStarred unless starred == nil
-      Models::StarredRepository.create(repository_id: repository.id, user_id: current_user.id)
+      Models::StarredRepository.create(repository_id: repository.id, user_id: current_user.id) unless starred
       repository
     end
 
     def unstar(repository, current_user)
       starred = Models::StarredRepository.where(repository_id: repository.id, user_id: current_user.id).first
-      raise NotStarred if starred == nil
-      starred.delete
+      starred.delete if starred
       repository
     end
 
diff --git a/lib/travis/api/v3/renderer/repository.rb b/lib/travis/api/v3/renderer/repository.rb
index 8b238a59..4f83327d 100644
--- a/lib/travis/api/v3/renderer/repository.rb
+++ b/lib/travis/api/v3/renderer/repository.rb
@@ -20,7 +20,8 @@ module Travis::API::V3
     end
 
     def starred
-      return true if Models::StarredRepository.where(repository_id: id, user_id: access_control.user.id).first
+      return false unless access_control.user
+      Models::StarredRepository.where(repository_id: id, user_id: access_control.user.id).any?
     end
 
     def include_default_branch?