@gklopper Why was this changed to an `Exception` before? Maybe we can keep it!