null pointer error fix
fix npe on server
Merge pull request #17 from rdwallis/nullfix

null pointer error fix