The macro for catching errors now catches more errors