Removed some throws