Fixed trouble with removed Client entity