Merge pull request #603 from pnicolucci/MYFACES-4611-22

MYFACES-4611: Avoid NPE when root is null