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

* commit 'f25f11ac75b12c35ebc56377b49631ed30c3dbcb':
  Fix node rejection crash