Update #654 - added null check around remove_StateChange event