ExceptionFactory refactoring; bugfixes