diff --git a/handshake_cache.go b/handshake_cache.go
index 3566f2fe4..85c87e640 100644
--- a/handshake_cache.go
+++ b/handshake_cache.go
@@ -122,7 +122,10 @@ func (h *handshakeCache) fullPullMap(startSeq int, cipherSuite CipherSuite, rule
 		ok = true
 		out[t] = rawHandshake.Message
 	}
-	return seq, out, ok
+	if !ok {
+		return seq, nil, false
+	}
+	return seq, out, true
 }
 
 // pullAndMerge calls pull and then merges the results, ignoring any null entries