Need extra nullness check.
Added --no-cb flag.