BS-11286
Handle null case properly