Error reporting

Tested and is GTG for 2.5.