Fix for Client Storage to return false if no client found