A little bit of sanity checking goes a long way
Client updated