Added redirect exception to make things faster