Improved error reporting
Improved error reporting details and formatting