null changes

Changed from null to empty map to avoid NPE in cc tests