refs #100888 Improve diagnostics a little more
refs #100888 Improve diagnostics a little more

svartika/ccnx,svartika/ccnx,cawka/ndnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,cawka/ndnx,cawka/ndnx,cawka/ndnx,svartika/ccnx,cawka/ndnx