Improved error reporting

Improved error reporting from ELGG.