Add errors, simplify controller error catching