Merge of Z3 into rabbitmq
Fixed null pointer errors