Exceptions management improved