Minor: fixed NPE when no cfg is present