diff --git a/library/bignum_core.c b/library/bignum_core.c
index a3547bd64..ad22a1542 100644
--- a/library/bignum_core.c
+++ b/library/bignum_core.c
@@ -516,8 +516,6 @@ int mbedtls_mpi_core_get_mont_R2_unsafe( mbedtls_mpi *X,
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
-    if ( X == NULL || N == NULL ) goto cleanup;
-
     MBEDTLS_MPI_CHK( mbedtls_mpi_lset( X, 1 ) );
     MBEDTLS_MPI_CHK( mbedtls_mpi_shift_l( X, N->n * 2 * biL ) );
     MBEDTLS_MPI_CHK( mbedtls_mpi_mod_mpi( X, X, N ) );
diff --git a/library/bignum_core.h b/library/bignum_core.h
index d46aea3e0..9870da41f 100644
--- a/library/bignum_core.h
+++ b/library/bignum_core.h
@@ -426,8 +426,7 @@ void mbedtls_mpi_core_montmul( mbedtls_mpi_uint *X,
  *                to store the value of Montgomery constant squared.
  * \return        #MBEDTLS_ERR_MPI_DIVISION_BY_ZERO if \p N modulus is zero.
  * \return        #MBEDTLS_ERR_MPI_NEGATIVE_VALUE if \p N modulus is negative.
- * \return        #MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED \p N, \p X are NULL
- *                or other operations fail.
+ * \return        #MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED if other operations fail.
  */
 int mbedtls_mpi_core_get_mont_R2_unsafe( mbedtls_mpi *X,
                                          mbedtls_mpi const *N );
diff --git a/tests/suites/test_suite_bignum.function b/tests/suites/test_suite_bignum.function
index 6b59a517f..b598ea624 100644
--- a/tests/suites/test_suite_bignum.function
+++ b/tests/suites/test_suite_bignum.function
@@ -4,7 +4,6 @@
 #include "mbedtls/entropy.h"
 #include "constant_time_internal.h"
 #include "test/constant_flow.h"
-#include "mbedtls/error.h"
 
 #if MBEDTLS_MPI_MAX_BITS > 792
 #define MPI_MAX_BITS_LARGER_THAN_792
@@ -1424,13 +1423,6 @@ void mpi_core_get_mont_R2_unsafe_neg(  )
     mbedtls_mpi_init( &RR );
     const char * n = "7ffffffffffffff1";
 
-    /* Test for NULL input pointers */
-    TEST_EQUAL( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED,
-               mbedtls_mpi_core_get_mont_R2_unsafe( NULL, &N ) );
-
-    TEST_EQUAL( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED,
-               mbedtls_mpi_core_get_mont_R2_unsafe( &RR, NULL ) );
-
     /* Test for zero divisor */
     TEST_EQUAL( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO,
                mbedtls_mpi_core_get_mont_R2_unsafe( &RR, &N ) );