Fix NPE and Number format exceptions for CC-41.