r=karnaze a=rickg, a=waterson some simple bullet-proofing for possible null pointer dereferencing git-svn-id: svn://10.0.0.236/trunk@81433 18797224-902f-48f8-a5cc-f745e15eee43