Merge "Throw exception when gatekeeper fails"