Fix fatal from exception, and improve its message

Bug: 59940
Change-Id: Id803f4e950f4ba7f7e78e19804847eb9f5829fed
Merge "Fix fatal from exception, and improve its message"