improved error messages when a node could not be found by the selection handler
Merge remote-tracking branch 'origin/master'