Removing generic exception handling to make sure errors propogate correctly