NPE fixed
NPE fixed