moved rescue to controller