Adding supports for global errors