[fix] redirect to error page didn't work properly
Merge 'develop' to 'master'
[fix] error page didn't work properly