Merge "Fix NPE if user is null"