Avoid errors on pre-rendering and redirection
Merge pull request #235 from YungSang/topic3

Avoid errors on pre-rendering and redirection