Fix error message.
Fix controller.