Added better error message. not much else can be done
Merge branch 'cc-4630-2' of https://github.com/rgrinberg/Airtime into 2.2.x
Merge branch '2.2.x' into 2.3.x