f86440b
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 8130305)
8130305