WIP error handling for proxy updates
activate changes
WIP activate changes