Update to new interface changes

* throw exceptions