SI-6939 Guarding against null pointer error