Tried to fix that in 6d651cf . My opinion is that message.disaster_class.rescue_building doesn't fit to well, because there will be disaster classes which don't need a rescue building.