diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 5efc03e5ec..34eb2b4423 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1727,7 +1727,7 @@ int ssl3_do_change_cipher_spec(SSL *s)
 
 	if (s->s3->tmp.key_block == NULL)
 		{
-		if (s->session == NULL) 
+		if (s->session == NULL || s->session->master_key_length == 0)
 			{
 			/* might happen if dtls1_read_bytes() calls this */
 			SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY);