add nil guard
Merge branch 'master' of github.com:hendrikb/spatio-backend