Merge "Catch Throwable instead of Exception." into oc-dev