Improved handling of rejected nodes