small refactoring
exception dialog added