CON-2306: remove try/catch block