am eeeaf73a: (-s ours) Add more error checking for ndc

Merge commit 'eeeaf73a023f66463f83f7048f98cc40a626e59a' into gingerbread

* commit 'eeeaf73a023f66463f83f7048f98cc40a626e59a':
  Add more error checking for ndc