Remove Controller
assertions and return errors instead
#10704
Merged
Controller
assertions and return errors instead
#10704