am 8eaacf46: am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndc

Merge commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f'

* commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f':
  Add more error checking for ndc