diff --git a/bn_mp_set_double.c b/bn_mp_set_double.c
index 0e230c7..6d84874 100644
--- a/bn_mp_set_double.c
+++ b/bn_mp_set_double.c
@@ -24,7 +24,7 @@ int mp_set_double(mp_int *a, double b)
    } cast;
    cast.dbl = b;
 
-   exp = (unsigned)(cast.bits >> 52) & 0x7FFU;
+   exp = (int)((unsigned)(cast.bits >> 52) & 0x7FFU);
    frac = (cast.bits & ((1ULL << 52) - 1ULL)) | (1ULL << 52);
 
    if (exp == 0x7FF) { /* +-inf, NaN */
@@ -38,6 +38,10 @@ int mp_set_double(mp_int *a, double b)
    }
 
    res = (exp < 0) ? mp_div_2d(a, -exp, a, NULL) : mp_mul_2d(a, exp, a);
+   if (res != MP_OKAY) {
+      return res;
+   }
+
    if (((cast.bits >> 63) != 0ULL) && (mp_iszero(a) == MP_NO)) {
       SIGN(a) = MP_NEG;
    }