moved rescue from if to the current user? section