From 75b7c801e3a0dcdc08adb823721ec76fd32ad975 Mon Sep 17 00:00:00 2001
From: "George Gelashvili, Sarah McAlear and Tira Odhner"
 <pair+ggelashvili+smcalear+aodhner@pivotal.io>
Date: Thu, 16 Feb 2017 11:30:53 -0500
Subject: [PATCH] Fixes bug with connecting to server

---
 web/pgadmin/browser/server_groups/servers/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py
index ad5607c3..ac92cd4c 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -584,7 +584,7 @@ class ServerNode(PGChildNodeView):
                     password=password,
                     server_types=ServerType.types()
                 )
-                if hasattr(str, 'decode'):
+                if hasattr(str, 'decode') and errmsg is not None:
                     errmsg = errmsg.decode('utf-8')
                 if not status:
                     db.session.delete(server)
-- 
2.11.0

