NPE guard
clean build