Updated returns/exceptions; waiting for fixes