Merge pull request #8122 from jmcanterafonseca/bug_841699_fixed

Bug 841669 - Contact list stops loading at certain contact: TypeError: e...(cherry picked from commit c64ee7587c9682856ae653bce95c56aea2daa979)