am 216c0fd9: am aa671a84: am 2fe1530c: Fix NPE

* commit '216c0fd96d9038fd447d0bf8548187ed5ef9b952':