NPE fixed.
NPE fixed.