Add node domain support to better handle errors