diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index bc4a8926c..574fd1df7 100644
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -5334,6 +5334,7 @@ static int _ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key,
     if (err == CRYPTOCB_UNAVAILABLE) {
         return NO_VALID_DEVID;
     }
+    return err;
     #endif
 #endif
 
diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c
index 87d75099e..a16f9ddaf 100644
--- a/wolfcrypt/src/rsa.c
+++ b/wolfcrypt/src/rsa.c
@@ -3179,9 +3179,10 @@ static int wc_RsaFunction_ex(const byte* in, word32 inLen, byte* out,
     /* fall-through when unavailable and try using software */
     #endif
     #ifdef WOLF_CRYPTO_CB_ONLY_RSA
-    if (ret == CRYPTOCB_UNAVAILABLE)
+    if (ret == CRYPTOCB_UNAVAILABLE) {
         return NO_VALID_DEVID;
     }
+    return ret;
     #endif
 #endif