domains: fix issues with abort on uncaught

First pass.