diff --git a/lib/travis/api/v3/services/repository/star.rb b/lib/travis/api/v3/services/repository/star.rb
index 8ec9659c..425b8dfd 100644
--- a/lib/travis/api/v3/services/repository/star.rb
+++ b/lib/travis/api/v3/services/repository/star.rb
@@ -4,7 +4,7 @@ module Travis::API::V3
       raise LoginRequired unless access_control.logged_in? or access_control.full_access?
       raise NotFound      unless repository = find(:repository)
       starred = Models::StarredRepository.where(repository_id: repository.id, user_id: access_control.user.id).first
-      raise AlreadyStarred unless starred.nil?
+      raise AlreadyStarred unless starred == nil
 
       Models::StarredRepository.create(repository_id: repository.id, user_id: access_control.user.id)
       repository #TODO what do we want to return???
diff --git a/lib/travis/api/v3/services/repository/unstar.rb b/lib/travis/api/v3/services/repository/unstar.rb
index 9b19fcb4..7ea5133f 100644
--- a/lib/travis/api/v3/services/repository/unstar.rb
+++ b/lib/travis/api/v3/services/repository/unstar.rb
@@ -3,9 +3,9 @@ module Travis::API::V3
     def run!
       raise LoginRequired unless access_control.logged_in? or access_control.full_access?
       raise NotFound      unless repository = find(:repository)
-      starred_repo = Models::StarredRepository.where(repository_id: repository.id, user_id: access_control.user.id)
-      raise NotStarred unless !starred_repo.nil?
-      starred_repo.first.delete
+      starred = Models::StarredRepository.where(repository_id: repository.id, user_id: access_control.user.id).first
+      raise NotStarred if starred == nil
+      starred.delete
       repository #TODO what do we want to return???
     end