diff --git a/library/cipher.c b/library/cipher.c
index 9f9f1075c7..fd04a7de13 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -263,7 +263,8 @@ int mbedtls_cipher_setup(mbedtls_cipher_context_t *ctx,
 
     memset(ctx, 0, sizeof(mbedtls_cipher_context_t));
 
-    if (NULL == (ctx->cipher_ctx = mbedtls_cipher_get_base(cipher_info)->ctx_alloc_func())) {
+    if ((mbedtls_cipher_get_base(cipher_info)->ctx_alloc_func != NULL) &&
+        (ctx->cipher_ctx = mbedtls_cipher_get_base(cipher_info)->ctx_alloc_func()) == NULL) {
         return MBEDTLS_ERR_CIPHER_ALLOC_FAILED;
     }