Removed error handling that we're not using, some of which wasn't correct anyway from copying + pasting