diff --git a/pglab/CrudModel.cpp b/pglab/CrudModel.cpp
index c4843ef..3764249 100644
--- a/pglab/CrudModel.cpp
+++ b/pglab/CrudModel.cpp
@@ -434,7 +434,7 @@ std::tuple<bool, CrudModel::ModifiedRow> CrudModel::updateRow(const PendingRow &
 		int row_number = pending_row.row();
 		Pgsql::Connection db_update_conn;
 		auto dbconfig = m_database->config();
-		db_update_conn.connect(dbconfig.connectionString().toStdString().c_str());
+		db_update_conn.connect(dbconfig.connectionString());
 		try {
 			auto result = db_update_conn.queryParam(buffer, params);
 			if (result && result.rows() == 1) {
@@ -528,7 +528,7 @@ std::tuple<bool, QString> CrudModel::removeRows(const std::set<IntegerRange<int>
 	try {
 		Pgsql::Connection db_update_conn;
 		auto dbconfig = m_database->config();
-		db_update_conn.connect(dbconfig.connectionString().toStdString().c_str());
+		db_update_conn.connect(dbconfig.connectionString());
 
 		// First delete rows in table
 		QString delete_statement = createDeleteStatement();
diff --git a/pglab/OpenDatabase.cpp b/pglab/OpenDatabase.cpp
index e128bfe..dac9160 100644
--- a/pglab/OpenDatabase.cpp
+++ b/pglab/OpenDatabase.cpp
@@ -48,11 +48,7 @@ TypeSelectionItemModel* OpenDatabase::typeSelectionModel()
 void OpenDatabase::refresh()
 {
 	Pgsql::Connection conn;
-	std::string connstr = m_config.connectionString().toStdString();
-	if (conn.connect(connstr.c_str())) {
-		m_catalog->loadAll(conn, nullptr);
-	}
-	else {
-		qDebug() << "Connect failed connstr: " << connstr.c_str();
-	}
+	auto connstr = m_config.connectionString();
+	conn.connect(connstr);
+	m_catalog->loadAll(conn, nullptr);
 }
diff --git a/pgsql/Pgsql_Connection.cpp b/pgsql/Pgsql_Connection.cpp
index e065ab8..0bf75f8 100644
--- a/pgsql/Pgsql_Connection.cpp
+++ b/pgsql/Pgsql_Connection.cpp
@@ -43,32 +43,16 @@ Canceller Connection::getCancel()
 	return c;
 }
 
-bool Connection::connect(const char *params)
+void Connection::connect(const char *params)
 {
-	bool result = false;
 	conn = PQconnectdb(params);
-	if (conn) {
-		ConnStatusType status = PQstatus(conn);
-		result = (status == CONNECTION_OK);
-	}
-    return result;
+	testForConnectionError(conn);
 }
 
 void Connection::connect(const char *const * keywords, const char* const * values, int expand_dbname)
 {
 	conn = PQconnectdbParams(keywords, values, expand_dbname);
-	std::string error_msg;
-	if (conn) {
-		ConnStatusType status = PQstatus(conn);
-		if (status == CONNECTION_OK)
-			return;
-
-		error_msg = PQerrorMessage(conn);
-	}
-	else {
-		error_msg = "Unknown connection failure (maybe out of memory?)";
-	}
-	throw PgException(error_msg);
+	testForConnectionError(conn);
 }
 
 bool Connection::connectStart(const char* params)
@@ -247,6 +231,22 @@ QString Connection::getDBName() const
 	return QString::fromUtf8(PQdb(conn));
 }
 
+void Connection::testForConnectionError(PGconn *conn)
+{
+	std::string error_msg;
+	if (conn) {
+		ConnStatusType status = PQstatus(conn);
+		if (status == CONNECTION_OK)
+			return;
+
+		error_msg = PQerrorMessage(conn);
+	}
+	else {
+		error_msg = "Unknown connection failure (maybe out of memory?)";
+	}
+	throw PgConnectionError(error_msg);
+}
+
 void Connection::throwError(PGresult *result) const
 {
 	auto state = PQresultStatus(result);
diff --git a/pgsql/Pgsql_Connection.h b/pgsql/Pgsql_Connection.h
index 2aa3336..eab2e7c 100644
--- a/pgsql/Pgsql_Connection.h
+++ b/pgsql/Pgsql_Connection.h
@@ -44,10 +44,10 @@ namespace Pgsql {
 		Connection(Connection &&rhs);
 		Connection& operator=(Connection &&rhs);
 
-		bool connect(const char *params);
-		bool connect(const QString &params)
+		void connect(const char *params);
+		void connect(const QString &params)
 		{
-			return connect(params.toUtf8().data());
+			connect(params.toStdString().c_str());
 		}
 
 		void connect(const char *const * keywords, const char* const * values, int expand_dbname);
@@ -115,6 +115,7 @@ namespace Pgsql {
 		PGconn *conn = nullptr;
 		std::function<void(const PGresult *)> notifyReceiver;
 
+		static void testForConnectionError(PGconn *conn);
 		void throwError(PGresult *result) const;
 		static void notifyReceiveFunc(void *arg, const PGresult *result);
 	};
diff --git a/pgsql/Pgsql_PgException.h b/pgsql/Pgsql_PgException.h
index 685a4ab..abbc0b6 100644
--- a/pgsql/Pgsql_PgException.h
+++ b/pgsql/Pgsql_PgException.h
@@ -34,15 +34,14 @@ namespace Pgsql {
 		Pgsql::ErrorDetails m_details;
     };
     
-//	class PgConnectionError: public PgException {
-//	public:
-//        PgConnectionError(const std::string &msg, std::string result_code)
-//            : PgResultError(msg, std::move(result_code))
-//        {}
-
-//	private:
+	class PgConnectionError: public PgException {
+	public:
+		PgConnectionError(const std::string &msg)
+			: PgException(msg)
+		{}
+	private:
         
-//    };
+	};