diff --git a/g10/ChangeLog b/g10/ChangeLog
index 80216ced3..c6dfa1db7 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-25  Werner Koch  <wk@gnupg.org>
+
+	* call-agent.c (learn_status_cb, scd_genkey_cb): Fixed faulty use
+	of !spacep().
+
 2003-10-20  Werner Koch  <wk@gnupg.org>
 
 	* card-util.c (card_edit): New command "passwd".  Add logic to
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 9ca127c3c..b981b7f22 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -520,14 +520,14 @@ learn_status_cb (void *opaque, const char *line)
           while (spacep (p))
             p++;
           parm->chv1_cached = atoi (p);
-          while (!spacep (p))
+          while (*p && !spacep (p))
             p++;
           while (spacep (p))
             p++;
           for (i=0; *p && i < 3; i++)
             {
               parm->chvmaxlen[i] = atoi (p);
-              while (!spacep (p))
+              while (*p && !spacep (p))
                 p++;
               while (spacep (p))
                 p++;
@@ -535,7 +535,7 @@ learn_status_cb (void *opaque, const char *line)
           for (i=0; *p && i < 3; i++)
             {
               parm->chvretry[i] = atoi (p);
-              while (!spacep (p))
+              while (*p && !spacep (p))
                 p++;
               while (spacep (p))
                 p++;
@@ -546,7 +546,7 @@ learn_status_cb (void *opaque, const char *line)
   else if (keywordlen == 7 && !memcmp (keyword, "KEY-FPR", keywordlen))
     {
       int no = atoi (line);
-      while (!spacep (line))
+      while (*line && !spacep (line))
         line++;
       while (spacep (line))
         line++;
@@ -674,7 +674,7 @@ scd_genkey_cb (void *opaque, const char *line)
       gcry_mpi_t a;
       const char *name = line;
 
-      while (!spacep (line))
+      while (*line && !spacep (line))
         line++;
       while (spacep (line))
         line++;