Add more controller error handling