Encapsulating Log tags and fixing NPE on first install.