Re-added exceptions mapped opus explicitly