MDH-15 adding exceptions and helper functions