Updated comments.
Added checking if the property exists.