Added some exception throws