Handle possible NPE if no node selected.
Review container selection.
Merge pull request #1668 from jburel/projection-npe

Projection NPE