Bug 922703 - Part 4: [Shared] Refine the error handler for card lock functionality