Error handling.
Error handling in server.js
Merge branch 'master' of github.com:sjlu/cities