am a15d6402: Merge "Fix crash caused by toHex returning exception"

* commit 'a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
  Fix crash caused by toHex returning exception