diff --git a/lasso/saml-2.0/logout.c b/lasso/saml-2.0/logout.c
index 332c3287..3d8859f0 100644
--- a/lasso/saml-2.0/logout.c
+++ b/lasso/saml-2.0/logout.c
@@ -83,6 +83,10 @@ lasso_saml20_logout_init_request(LassoLogout *logout, LassoProvider *remote_prov
 	assertion = (LassoSaml2Assertion*)assertion_n;
 
 	/* Set the NameID */
+	goto_cleanup_if_fail_with_rc(assertion->Subject != NULL,
+			LASSO_PROFILE_ERROR_MISSING_SUBJECT);
+	goto_cleanup_if_fail_with_rc(assertion->Subject->NameID != NULL,
+			LASSO_PROFILE_ERROR_MISSING_NAME_IDENTIFIER);
 	lasso_assign_gobject(logout_request->NameID, assertion->Subject->NameID);
 
 	/* Encrypt NameID */