@adrn - I think this exception shouldn't be here?