am 33a0ad56: Fixing NPE. (Bug 6460298)

* commit '33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8':
  Fixing NPE. (Bug 6460298)