Bug 1039239 - Better NFC handover error handling - v2.0