diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 780cea362f77c07d55a61644ab46faf1dee6f30a..0d37df4a7a1a7039ad6298ae18fd0ec22e56726d 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -603,5 +603,9 @@ Wed Jun 16 20:21:42 CEST 1999
 Thu Jun 24 18:06:43 CEST 1999
 
 	- Fixed C comment bug that caused ecpg to not accept quoted quotes.
+
+Fri Jun 25 07:17:10 CEST 1999
+
+	- Changed error message in ecpglib.c to list correct database name.
 	- Set library version to 3.0.0
 	- Set ecpg version to 2.6.0
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
index 88c3057d9a34de5f8ee6208e490e1a5118e8c976..b74febcd1cce7b8f95cda8c345781390119c63c4 100644
--- a/src/interfaces/ecpg/lib/ecpglib.c
+++ b/src/interfaces/ecpg/lib/ecpglib.c
@@ -1238,7 +1238,7 @@ ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd
 
 	actual_connection = all_connections = this;
 
-	ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "NULL", user ? "for user " : "", user ? user : "");
+	ECPGlog("ECPGconnect: opening database %s %s%s\n", dbname ? dbname : "<DEFAULT>", user ? "for user " : "", user ? user : "");
 
 	sqlca.sqlcode = 0;
 
@@ -1247,8 +1247,8 @@ ECPGconnect(int lineno, const char *dbname, const char *user, const char *passwd
 	if (PQstatus(this->connection) == CONNECTION_BAD)
 	{
 		ECPGfinish(this);
-		ECPGlog("connect: could not open database %s %s%s in line %d\n", dbname ? dbname : "NULL", user ? "for user " : "", user ? user : "", lineno);
-		register_error(ECPG_CONNECT, "connect: could not open database %s.", dbname ? dbname : "NULL");
+		ECPGlog("connect: could not open database %s %s%s in line %d\n", dbname ? dbname : "<DEFAULT>", user ? "for user " : "", user ? user : "", lineno);
+		register_error(ECPG_CONNECT, "connect: could not open database %s.", dbname ? dbname : "<DEFAULT>");
 		return false;
 	}