fix a NPE leading to broker 500 response