Improve error handling (NPE in DRT2)

Bug: 3284126
Change-Id: I7f8c6259f2932d2b1a10a2f9612866786d425da9
2 files changed