IDE-1457 WIP: Improved error reporting