am 32881e8d: Fix NPE after migrating older account

* commit '32881e8dd375f16e6059452166503f7136f14ae5':
  Fix NPE after migrating older account