Clean up exception raising in highstate