diff --git a/sm/ChangeLog b/sm/ChangeLog
index c1a8f6411..5571540be 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-20  Werner Koch  <wk@gnupg.org>
+
+	* certchain.c (gpgsm_validate_chain): The trust check didn't
+	worked anymore, probably due to the changes at 2003-03-04.  Fixed.
+
 2004-06-06  Werner Koch  <wk@gnupg.org>
 
 	* certreqgen.c (get_parameter_uint, create_request): Create
diff --git a/sm/certchain.c b/sm/certchain.c
index 3009c21aa..8d54767f8 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -701,6 +701,9 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t r_exptime,
                          gpg_strerror (rc));
             }
           
+          if (rc)
+            goto leave;
+
           /* Check for revocations etc. */
           if ((flags & 1))
             rc = 0;