Getting rid of nullClient
Adding a comment to make the linter happy