MB-58 #comment catching upstream exceptions