diff --git a/src/misc/crypt/crypt_register_all_ciphers.c b/src/misc/crypt/crypt_register_all_ciphers.c
index d975193..3250a93 100644
--- a/src/misc/crypt/crypt_register_all_ciphers.c
+++ b/src/misc/crypt/crypt_register_all_ciphers.c
@@ -16,13 +16,11 @@
 */
 
 #define REGISTER_CIPHER(h) do {\
-   LTC_ARGCHK((err = register_cipher(h)) != -1); \
+   LTC_ARGCHK(register_cipher(h) != -1); \
 } while(0)
 
 int register_all_ciphers(void)
 {
-   int err = CRYPT_NOP;
-
 #ifdef LTC_RIJNDAEL
 #ifdef ENCRYPT_ONLY
    /* alternative would be
@@ -94,7 +92,7 @@ int register_all_ciphers(void)
 #ifdef LTC_CAMELLIA
    REGISTER_CIPHER(&camellia_desc);
 #endif
-   return err;
+   return CRYPT_OK;
 }
 
 /* ref:         $Format:%D$ */
diff --git a/src/misc/crypt/crypt_register_all_hashes.c b/src/misc/crypt/crypt_register_all_hashes.c
index 627b6a8..b529389 100644
--- a/src/misc/crypt/crypt_register_all_hashes.c
+++ b/src/misc/crypt/crypt_register_all_hashes.c
@@ -16,12 +16,11 @@
 */
 
 #define REGISTER_HASH(h) do {\
-   LTC_ARGCHK((err = register_hash(h)) != -1); \
+   LTC_ARGCHK(register_hash(h) != -1); \
 } while(0)
 
 int register_all_hashes(void)
 {
-   int err = CRYPT_NOP;
 #ifdef LTC_TIGER
    REGISTER_HASH(&tiger_desc);
 #endif
@@ -90,9 +89,9 @@ int register_all_hashes(void)
 #endif
 #ifdef LTC_CHC_HASH
    REGISTER_HASH(&chc_desc);
-   LTC_ARGCHK((err = chc_register(find_cipher_any("aes", 8, 16))) == CRYPT_OK);
+   LTC_ARGCHK(chc_register(find_cipher_any("aes", 8, 16)) == CRYPT_OK);
 #endif
-   return err;
+   return CRYPT_OK;
 }
 
 /* ref:         $Format:%D$ */
diff --git a/src/misc/crypt/crypt_register_all_prngs.c b/src/misc/crypt/crypt_register_all_prngs.c
index 939bf20..aca8a36 100644
--- a/src/misc/crypt/crypt_register_all_prngs.c
+++ b/src/misc/crypt/crypt_register_all_prngs.c
@@ -16,12 +16,11 @@
 */
 
 #define REGISTER_PRNG(h) do {\
-   LTC_ARGCHK((err = register_prng(h)) != -1); \
+   LTC_ARGCHK(register_prng(h) != -1); \
 } while(0)
 
 int register_all_prngs(void)
 {
-   int err = CRYPT_NOP;
 #ifdef LTC_YARROW
    REGISTER_PRNG(&yarrow_desc);
 #endif
@@ -41,7 +40,7 @@ int register_all_prngs(void)
    REGISTER_PRNG(&sprng_desc);
 #endif
 
-   return err;
+   return CRYPT_OK;
 }
 
 /* ref:         $Format:%D$ */
diff --git a/tests/test.c b/tests/test.c
index 7d94f98..c744849 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -275,9 +275,18 @@ static void register_algs(void)
 #ifndef LTC_YARROW
    #error This demo requires Yarrow.
 #endif
-  register_all_ciphers();
-  register_all_hashes();
-  register_all_prngs();
+   if ((err = register_all_ciphers()) != CRYPT_OK) {
+      fprintf(stderr, "register_all_ciphers err=%s\n", error_to_string(err));
+      exit(EXIT_FAILURE);
+   }
+   if ((err = register_all_hashes()) != CRYPT_OK) {
+      fprintf(stderr, "register_all_hashes err=%s\n", error_to_string(err));
+      exit(EXIT_FAILURE);
+   }
+   if ((err = register_all_prngs()) != CRYPT_OK) {
+      fprintf(stderr, "register_all_prngs err=%s\n", error_to_string(err));
+      exit(EXIT_FAILURE);
+   }
 
    if ((err = rng_make_prng(128, find_prng("yarrow"), &yarrow_prng, NULL)) != CRYPT_OK) {
       fprintf(stderr, "rng_make_prng failed: %s\n", error_to_string(err));