Fixed NPE code that was trying to use a null facet object (which was OK to be null).