Prevent crash on log-out
Merge remote-tracking branch 'origin'