[2.1] [FEATURE WIP] Groups

I think this exception is wrong anyway? Surely it should extend the model exception?