Merge "Add NULL check in updateProxyConfig"