Updated returns/exceptions management