Moved check for builder null in other if cause its the only place it can be null... wooooo