diff --git a/common/ChangeLog b/common/ChangeLog
index 7fc6bb60f..28395053c 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,5 +1,7 @@
 2004-02-17  Werner Koch  <wk@gnupg.org>
 
+	* simple-pwquery.c (agent_open): Ignore an empty GPG_AGENT_INFO.
+
 	* errors.h: Added STATUS_IMPORT_OK.
 
 2004-02-10  Werner Koch  <wk@gnupg.org>
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index afdc4e2a4..5ceddc613 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -266,7 +266,7 @@ agent_open (int *rfd)
 
   *rfd = -1;
   infostr = getenv ( "GPG_AGENT_INFO" );
-  if ( !infostr ) 
+  if ( !infostr || !*infostr ) 
     {
 #ifdef SPWQ_USE_LOGGING
       log_error (_("gpg-agent is not available in this session\n"));