Added some throws statements to get it building again