Merge pull request #277 from mrjoel/mrjoel-serverNPEfix

NPE server fix