Fixed and extend Legend error checking

So that PNG Legend assignments and Facet Flows are handled correctly