saml: Restructure code to get correct error message for invalid entityID.
saml: Restructure code to get correct error message for invalid entityID.

sgomez/saml2,cb8/saml2,sitya/saml2,madmatt/saml2,ArtemTeleshev/php-saml2,newmen/saml2,simplesamlphp/saml2