fix some throws