diff --git a/scd/ChangeLog b/scd/ChangeLog
index 9f0a13d98..1ce2befc4 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-10  Werner Koch  <wk@gnupg.org>
+
+	* card.c (card_open): Return immediately when no reader is available.
+
 2002-03-27  Werner Koch  <wk@gnupg.org>
 
 	* card.c (card_open, card_close): Adjusted for changes in OpenSC.
diff --git a/scd/card.c b/scd/card.c
index 0c8bf7c03..629e2936b 100644
--- a/scd/card.c
+++ b/scd/card.c
@@ -138,6 +138,7 @@ card_open (CARD *rcard)
     {
       log_error ("no card reader available\n");
       rc = GNUPG_Card_Error;
+      goto leave;
     }
   card->ctx->error_file = log_get_stream ();
   if (opt.debug)