Revert "fixing bug with null property"

This reverts commit db692c8b3f5686ac172f329d751d36a06efd64c8.