Added exceptions to public API issue #14