ensure error message correct, and add extra debug output
ensure error message correct, and add extra debug output

madAndroid/build-cloud,mikesilky/build-cloud,mikemead/build-cloud,scalefactory/build-cloud,MrPrimate/build-cloud,randomvariable/build-cloud