Added custom error presenter handling
Merge branch 'test-refactoring'