Returning 404 for inexistent users and collections

app/controllers/v1/collections_controller.rb

@@ -114,7 +114,11 @@ class V1::CollectionsController < ApplicationController
   def stageable; set_collection; end
 
   def set_collection
-    @collection ||= Collection.find(params[:id])
+    @collection ||= Collection.where(id: params[:id]).first
+
+    render status: :not_found if @collection.blank?
+
+    @collection
   end
 
   def set_new_collection

app/controllers/v1/users_controller.rb

@@ -210,7 +210,11 @@ class V1::UsersController < ApplicationController
 
   def set_user
     users = paginate policy_scope(User)
-    @user = users.find(params[:id])
+    @user = users.where(id: params[:id]).first
+
+    render status: :not_found if @user.blank?
+
+    @user
   end
 
   def set_new_user