Added check that properties exist.