Change the way we handle errors

`.catch` should catch from chain