Don't set client to nil, since most places assume this is always set …#170