Added checking for valid property on relationship