Put try catch in CORE-2134