Having this as a generic Exception can be problematic, any way we could target a specific one?