Merge "Improve error handling (NPE in DRT2)" into honeycomb