Fix #811 - Add null check around StateChange event
Updates before Version 1.7.3 for ADO