A couple "error" catchers replaced with Exception catchers