TIM-231: Addressing feedback from @wedaly

* Improved error handling and reporting