am 599c3cfa: Fix a NPE

* commit '599c3cfaeff6ff519b08467a3fcd96fb33c0e1e1':
  Fix a NPE