Don't crash on netmerge

Services propagating registered users will crash a netmerge.  This fixes that.
(I'm sorry I previously failed.)

Edit: I just added another bug fix.