removed more unneeded throws