Issue #154: Fix header generation via Exceptions.