diff --git a/library/ecdsa.c b/library/ecdsa.c
index 3fddc4e4d..73389bb94 100644
--- a/library/ecdsa.c
+++ b/library/ecdsa.c
@@ -172,6 +172,7 @@ static void ecdsa_restart_det_free( mbedtls_ecdsa_restart_det_ctx *ctx )
 #define ECDSA_BUDGET( ops )   \
     MBEDTLS_MPI_CHK( mbedtls_ecp_check_budget( grp, &rs_ctx->ecp, ops ) );
 
+/* Call this when entering a function that needs its own sub-context */
 #define ECDSA_RS_ENTER( SUB )   do {                                 \
     /* reset ops count for this call if top-level */                 \
     if( rs_ctx != NULL && rs_ctx->ecp.depth++ == 0 )                 \
@@ -189,9 +190,11 @@ static void ecdsa_restart_det_free( mbedtls_ecdsa_restart_det_ctx *ctx )
     }                                                                \
 } while( 0 )
 
+/* Call this when leaving a function that needs its own sub-context */
 #define ECDSA_RS_LEAVE( SUB )   do {                                 \
     /* clear our sub-context when not in progress (done or error) */ \
-    if( rs_ctx != NULL && ret != MBEDTLS_ERR_ECP_IN_PROGRESS )       \
+    if( rs_ctx != NULL && rs_ctx->SUB != NULL &&                     \
+        ret != MBEDTLS_ERR_ECP_IN_PROGRESS )                         \
     {                                                                \
         ecdsa_restart_## SUB ##_free( rs_ctx->SUB );                 \
         mbedtls_free( rs_ctx->SUB );                                 \
diff --git a/library/ecp.c b/library/ecp.c
index a8c367a3d..0c9feae3f 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -1989,7 +1989,8 @@ cleanup:
 
     /* clear our sub-context when not in progress (done or error) */
 #if defined(MBEDTLS_ECP_RESTARTABLE)
-    if( rs_ctx != NULL && ret != MBEDTLS_ERR_ECP_IN_PROGRESS )
+    if( rs_ctx != NULL && rs_ctx->rsm != NULL &&
+        ret != MBEDTLS_ERR_ECP_IN_PROGRESS )
     {
         ecp_restart_mul_free( rs_ctx->rsm );
         mbedtls_free( rs_ctx->rsm );
@@ -2457,7 +2458,8 @@ cleanup:
 
 #if defined(MBEDTLS_ECP_RESTARTABLE)
     /* clear our sub-context when not in progress (done or error) */
-    if( rs_ctx != NULL && ret != MBEDTLS_ERR_ECP_IN_PROGRESS )
+    if( rs_ctx != NULL && rs_ctx->ma != NULL &&
+        ret != MBEDTLS_ERR_ECP_IN_PROGRESS )
     {
         ecp_restart_muladd_free( rs_ctx->ma );
         mbedtls_free( rs_ctx->ma );