Add protection against mixed up ContentType tables