Fixes Issue 9635 - Improve message on missing this diagnostics.