Merge "Improve dx error handling"
am: 76aa4cd935

* commit '76aa4cd93590bcd41efe5c5b7858b2e5cf0d8355':
  Improve dx error handling