since we have two exceptions already - yes, adding separate module makes sense.