Add some error checking.

Change-Id: I007b1429a64b39ffd5cdef200c295d5a31f95048
3 files changed