--- a/libpurple/purple-gio.c	Sat Aug 27 18:37:48 2016 -0500
+++ b/libpurple/purple-gio.c	Fri Aug 26 18:50:34 2016 -0500
@@ -113,12 +113,9 @@
 	GProxyResolver *resolver;
 	GSocketClient *client;
 
-	resolver = purple_proxy_get_proxy_resolver(account);
+	resolver = purple_proxy_get_proxy_resolver(account, error);
 
 	if (resolver == NULL) {
-		g_set_error_literal(error, PURPLE_CONNECTION_ERROR,
-				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-				_("Invalid proxy settings"));
 		return NULL;
 	}