diff --git a/include/mbedtls/ecdh.h b/include/mbedtls/ecdh.h
index f17446c..05b2b03 100644
--- a/include/mbedtls/ecdh.h
+++ b/include/mbedtls/ecdh.h
@@ -312,8 +312,8 @@
  * \param ctx       The ECDH context to set up. This must be initialized.
  * \param key       The EC key to use. This must be initialized.
  * \param side      Defines the source of the key. Possible values are:
- *                  - \c 1: The imported key is ours.
- *                  - \c 0: The imported key is that of the peer.
+ *                  - #MBEDTLS_ECDH_OURS: The key is ours.
+ *                  - #MBEDTLS_ECDH_THEIRS: The key is that of the peer.
  *
  * \return          \c 0 on success.
  * \return          Another \c MBEDTLS_ERR_ECP_XXX error code on failure.
@@ -338,7 +338,7 @@
  * \param olen      The address at which to store the number of Bytes written.
  *                  This must not be \c NULL.
  * \param buf       The destination buffer. This must be a writable buffer
- *                  of lsength \p blen Bytes.
+ *                  of length \p blen Bytes.
  * \param blen      The size of the destination buffer \p buf in Bytes.
  * \param f_rng     The RNG function to use. This must not be \c NULL.
  * \param p_rng     The RNG context to be passed to \p f_rng. This may be
diff --git a/library/ecdh.c b/library/ecdh.c
index 37927f7..da95c60 100644
--- a/library/ecdh.c
+++ b/library/ecdh.c
@@ -64,10 +64,6 @@
                     mbedtls_ecp_restart_ctx *rs_ctx )
 {
     int ret;
-    ECDH_VALIDATE_RET( grp != NULL );
-    ECDH_VALIDATE_RET( d != NULL );
-    ECDH_VALIDATE_RET( Q != NULL );
-    ECDH_VALIDATE_RET( f_rng != NULL );
 
     /* If multiplication is in progress, we already generated a privkey */
 #if defined(MBEDTLS_ECP_RESTARTABLE)
@@ -513,6 +509,7 @@
     ECDH_VALIDATE_RET( ctx != NULL );
     ECDH_VALIDATE_RET( olen != NULL );
     ECDH_VALIDATE_RET( buf != NULL );
+    ECDH_VALIDATE_RET( f_rng != NULL );
 
 #if defined(MBEDTLS_ECP_RESTARTABLE)
     restart_enabled = ctx->restart_enabled;