Fixes #3727 - intermittent exception in UpdateStateIcons