proper lockout error handling (bug 797930)