Added new invalid attribute exception, plus some work on facets