Update to Controller to handle errors better