Whoops, missed a != and instead put ==.  This should really cover the issue where Client is null.  Also added some extra insurance in another method.