Added exceptions management