Corrected class that would have failed with nullPointer.
Authored by: jwjoubert 2015-05-04
Parent: [r32938]
Child: [r32940]