CC-5270: looping on InvalidContentType