NPE fixed.