more uncaught exception fixes