Updated returns/exceptions management; waiting for fixes