V1.2; removed internal try/catch block