SAML 1 apparently assumes you can set the validation URL ahead of time. In SAML 2, however, the validation url includes the ticket, so that won't work.
Moved the check for pre-set validation url into the switch statement so that the saml 2 version can still build the url correctly.