* commit 'ad66480838189332b82cd2861bca4357aa2b93da': Avoid NullPointerException if createUser returns null