Removed unneeded UnsupportedTypeException thowing and catching.