Merge pull request #218 from csmith/master

Server tidying.
Make getParser() optional.

Returning null is bad.