Build 43 - Fixed NPE in main.java