Bug 922703 - Part 3: [System] Refine the error handler for card lock functionality