A NPE was corrected.