Avoiding possible NULL pointer dereference
Authored by: bloehr 2015-12-10
Parent: [r1472]
Child: [r1474]