diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 533ded6..ae35efc 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1710,6 +1710,9 @@
 
         status = psa_copy_key_material_into_slot(
             slot, (uint8_t *) (&slot_number), sizeof(slot_number));
+        if (status != PSA_SUCCESS) {
+                return status;
+        }
     }
 
     if (*p_drv == NULL && method == PSA_KEY_CREATION_REGISTER) {