Bugfix replacing removed exception classes