am 6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb

* commit '6b3dc7a29a5c642c6ca2214c47199dec71912d0d':
  Improve error handling (NPE in DRT2)