Added some guards against setting an invalid NKI. It just happened!