Change error text, streamline fire-once redirect code