Removed @override and added a null check to avoid null pointers.
Authored by: sboddu1 2013-08-09
Parent: [r1161]
Child: [r1163]