Adds stop to server query.

Goodness, I need to look up how to merge pull requests. Please forgive my spam.