Merge "Fix node rejection crash" into nyc-dev
am: e83cca3a3a

* commit 'e83cca3a3a235cf343c81ddff68e6a944ba91647':
  Fix node rejection crash