Merge "Add more error checking for ndc" into froyo