return early for redirects
redirect too much
add missing redirects
Merge pull request #681 from dereuromark/master-return-redirect

return early for redirects