Merge "BUG-731: do not catch Throwable"