New version that fixes a problem with addon errors firing.