Added exceptions to certain methods.