Don't hide problems in Supply.mergs -> more handling