Null reference in watch and chenge is fixed