Handling of bad NDC is better now