Fixed 500 error for anonymous user
Merge remote-tracking branch 'gooru/master'
Merge pull request #823 from yamunaBQ/master

Fixed 500 error for anonymous user