Merge "Catch throwable exceptions." into nyc-mr1-dev