fix BuildHandler NPE from previous checkin