fix rebase-brought NPE...