Added exceptions and proxy class