Fix exception during icon update