Fix error when name is nil
Merge branch 'master' of github.com:zomeki/zomeki-private-00