#736 - Avoid NPE and cross-broker error