automerge: 2805669 * commit '2805669954b70b918d7b24f6695c4da85d6f88e8': Avoid NullPointerException if createUser returns null
automerge: 2805669 * commit '2805669954b70b918d7b24f6695c4da85d6f88e8': Avoid NullPointerException if createUser returns null