Comment 7 for bug 862944

The fix committed fixed the reported case, but the same error was raised again with a more complex root cause: see 52679-2174canistelubuntu1983.oops

The new fix is more generic and *should* prevent this error from preventing login