Exception refactoring, uses now stdexcept