diff --git a/scd/app.c b/scd/app.c
index 3961bdf6c..aeb773a67 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -447,7 +447,7 @@ app_send_devinfo (ctrl_t ctrl, int keep_looping)
         }
       send_status_direct (ctrl, "DEVINFO_END", "");
 
-      if (no_device && !keep_looping)
+      if (keep_looping == 0)
         break;
 
       card_list_wait ();
diff --git a/scd/command.c b/scd/command.c
index 8bc8f7f4e..10f5a2fe1 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -2312,7 +2312,7 @@ static const char hlp_devinfo[] =
   "\n"
   "Return information about devices.  If the option --watch is given,\n"
   "it keeps reporting status change until it detects no device is\n"
-  "available."
+  "available.\n"
   "The information is returned as a status line using the format:\n"
   "\n"
   "  DEVICE <card_type> <serialno> <app_type>\n"