added null check for proper validation
Authored by: samantprajakta 2013-06-12
Parent: [r805]
Child: [r807]