Fixed bug in Exchange.Builder that caused an NPE