RAVE-1274 | Ensure a null user won't throw an NPE
2 files changed