Whoops forgot to add exception handling back