Fixed issues with null client