CC-5709: Even more slightly better exception handling
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas