Revert "data: fixed bug in raising exception with nds"

This reverts commit 6aebd3a931f226b74d46267b5806047deebe3a1b.
data: correct fix to NDS bug