Fix rescues in controller