Fix few NPE