CJDv14 added some exception catching