When the data is null, it should not throw an Exception
Merge pull request #1 from swachian/master

When the data is null, it should not throw an Exception