Merge "Improve dx error handling"