Bug 922703 - Refine the error handler for card lock functionality