Removing throwing types - I have a better idea