--- a/src/DriverManager.cpp	Mon May 25 19:36:06 2020 +0200
+++ b/src/DriverManager.cpp	Mon May 25 21:11:17 2020 +0200
@@ -31,7 +31,7 @@
 DriverManager::DriverManager() {
 	env = OdbcCommon::allocateHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE);
 	SQLRETURN result = SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, (void*) SQL_OV_ODBC3, 0);
-	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to set ODBC version"); // TODO:, result, SQL_HANDLE_ENV, environment);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to set ODBC version", result, SQL_HANDLE_ENV, env);
 }
 
 DriverManager::~DriverManager() {
@@ -51,7 +51,7 @@
 		// TODO: check nameLength and descriptionLength whether values were truncated?
 		if (OdbcCommon::isSuccessful(result)) list.push_back({convertor.from_bytes((char*) name), convertor.from_bytes((char*) description)});
 		else if (result == SQL_NO_DATA_FOUND) break;
-		else throw SqlException(L"Unable to list data sources: " + std::to_wstring(result));
+		else throw SqlException(L"Unable to list data sources: " + std::to_wstring(result), result, SQL_HANDLE_ENV, env);
 	}
 	return list;
 }