am fe69287b: Fix new NPE relating to reorder hints

* commit 'fe69287b97d16c8941ab9463e4868fca45ad8152':
  Fix new NPE relating to reorder hints