Error subscriber refactoring