Clean code (remove unnecessary 'if's)
Fix no error object for update/remove without permission