Fixing NRE when setting properties to null
Adding a unit test
Fixing unit test
Fixing null check
Merge pull request #105 from sebastienros/bug/101

Bug/101