Change error handling code to include server name for node-specific errors