improved error handling within the ORM system