comment tweak
Enhance error handling/reporting