Moved scheme check to check redirects too