Fix error due to bad exception throwing
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas