Removed redirects and have error pages show on initial call