diff --git a/src/libei-handshake.c b/src/libei-handshake.c
index f157690..e519fe9 100644
--- a/src/libei-handshake.c
+++ b/src/libei-handshake.c
@@ -83,7 +83,7 @@ ei_handshake_initialize(struct ei_handshake *setup, uint32_t version)
 								EI_HANDSHAKE_CONTEXT_TYPE_SENDER :
 								EI_HANDSHAKE_CONTEXT_TYPE_RECEIVER);
 
-	if (version >= EI_HANDSHAKE_REQUEST_NAME_SINCE_VERSION)
+	if (version >= EI_HANDSHAKE_REQUEST_NAME_SINCE_VERSION && ei->name != NULL)
 		ei_handshake_request_name(setup, ei->name);
 
 	if (version >= EI_HANDSHAKE_REQUEST_INTERFACE_VERSION_SINCE_VERSION) {