16ead6e
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 2220fd8)
2220fd8