Null fixes to CIString