Add better controller error handling