21 server clean error

Resolves issue #21