Minor refactor.
Fixed undefined error while 500 error occurred.
Merge branch 'master' of https://bitbucket.org/elin_moco/ffclub