Extra test client protection against null reponses