Use findById
Make permission collision error clear
Removed dead code
Updated permission checking