DVONE-479 better form of try/catch