diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 960906bd1..15d14fa88 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1389,7 +1389,8 @@ static int ssl_parse_client_hello( ssl_context *ssl )
 
 #if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
                 if( ssl_ciphersuite_uses_ec( ciphersuite_info ) &&
-                    ssl->handshake->curves[0] == NULL )
+                    ( ssl->handshake->curves == NULL ||
+                      ssl->handshake->curves[0] == NULL ) )
                     continue;
 #endif