am 10dff768: Fix NPE introduced by I38b21d49

* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
  Fix NPE introduced by I38b21d49