Fix nil error
Merge branch 'master' of https://github.com/zomeki/zomeki-development into work