NPE fix & new version