Add throws declarations take 2