Fixed error in server with null account
Merge branch 'master' of https://github.com/knarr/winter