Added error protection overrides