Make diagnostics.py more error-tolerant and have wider range of suppo…

Make diagnostics.py more error-tolerant and have wider range of suppo… #684