diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index 507f212b0..653f16ed4 100644
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -4192,7 +4192,8 @@ static int accel_fp_mul(int idx, mp_int* k, ecc_point *R, mp_int* modulus,
    }
 
    if (err == MP_OKAY) {
-      z = 0;
+      z = 0;    /* mp_to_unsigned_bin != MP_OKAY z will be declared/not set */
+      (void) z; /* Acknowledge the unused assignment */
       ForceZero(kb, KB_SIZE);
       /* map R back from projective space */
       if (map) {
@@ -4448,6 +4449,9 @@ static int accel_fp_mul2add(int idx1, int idx2,
    XFREE(kb[1], NULL, DYNAMIC_TYPE_TMP_BUFFER);
 #endif
 
+    if (err != MP_OKAY)
+        return err;
+
 #undef KB_SIZE
 
    return ecc_map(R, modulus, mp);