Added some missing exceptions.