Add more checks, attempting to fix createClientNullTest