Analyzer comments removed, catch  block fixed