Changed CommonRegistryProxy to maybe fix a build issue being cause by throw e