CFY-1674 fix logger usage
CFY-1674 fix exception catching