DefinitionException rather than InvalidArgumentException?