bernd-wechner Made it more robust against a missing request user