Added checking for Null Value