Start fixing up the exception syntax