Fixed NPE, added buildNumber