Resolved Issue #69 by adding null safe check similar to the one in issue #25
Merge pull request #70 from NarendraPathai/Issue69

Fixed Issue #69 by adding null safe check similar to the one in issue #25