catch user==null
Merge branch 'hotfix/0.0.7.2'