Ensure return_controller is specified, fixes #9466