Fixed NPE when property was not defined