Extra checking to avoid failure on faulty requests