Issue #6: Error entities, wrappers and modules