Backport commit r4613  NDSSystem - Fix potential crashing bug