Add close(), changed exceptions throwing