am 3e455284: Fix NPE

* commit '3e455284e1e0432fd533de7f082e1426d152d78d':
  Fix NPE