diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index c2a4c7f..249f7bd 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -141,8 +141,8 @@
 
     ecdsa_init( &ecdsa );
 
-    ret = ecdsa_from_keypair( &ecdsa, ctx ) ||
-          ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
+    if( ( ret = ecdsa_from_keypair( &ecdsa, ctx ) ) == 0 )
+        ret = ecdsa_verify_wrap( &ecdsa, md_alg, hash, hash_len, sig, sig_len );
 
     ecdsa_free( &ecdsa );