fix a NPE leading to broker 500 response

I am hunting frequent broker 500 responses, traced it to a NPE, doing a PR on first fix attempt.

Currently deploying in my cluster to see if that helps.