CFG building - defect fix NRE