[BISERVER-11606] Guarding against NPE