Removed unecessary exceptions