Fixed bug with null properties