Merge pull request #652 from jchampemont/master

Handle deleted users
fix #651: handle deleted users.
Merge pull request #655 from adericbourg/master

fix #651: handle deleted users.