diff --git a/gears/carto_gears_api/lib/carto_gears_api/errors.rb b/gears/carto_gears_api/lib/carto_gears_api/errors.rb
index 7dd2aad81f..3f56347652 100644
--- a/gears/carto_gears_api/lib/carto_gears_api/errors.rb
+++ b/gears/carto_gears_api/lib/carto_gears_api/errors.rb
@@ -2,8 +2,8 @@ module CartoGearsApi
   module Errors
     # Thrown when an object could not be found in the database
     class RecordNotFound < StandardError
-      def initialize(object)
-        super("Could not find #{object.class.name.split('::').last} with id #{object.id}")
+      def initialize(object, id)
+        super("Could not find #{object} with id #{id}")
       end
     end
 
diff --git a/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb b/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb
index 21baaa2fdf..c1d18e0984 100644
--- a/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb
+++ b/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb
@@ -60,9 +60,9 @@ module CartoGearsApi
       end
 
       def find_user(user_id)
-        db_user = ::User.find(id: updated_user.id)
-        raise CartoGearsApi::Errors::RecordNotFound.new(updated_user) unless db_user
-        db_user
+        user = ::User.find(id: user_id)
+        raise CartoGearsApi::Errors::RecordNotFound.new('User', user_id) unless user
+        user
       end
     end
   end