From 0e24beb6aa7e4ebabff4bb50f02a7f268042df14 Mon Sep 17 00:00:00 2001
From: Chris Beck <render787@gmail.com>
Date: Sat, 7 Jun 2014 23:42:06 -0400
Subject: [PATCH] catch exceptions thrown in unit dtor

---
 src/unit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/unit.cpp b/src/unit.cpp
index bf77e8560fe4..f636ec92d7c5 100644
--- a/src/unit.cpp
+++ b/src/unit.cpp
@@ -622,6 +622,7 @@ unit::unit(const unit_type &u_type, int side, bool real_unit,
 
 unit::~unit()
 {
+	try {
 	clear_haloes();
 
 	// Remove us from the status cache
@@ -631,6 +632,7 @@ unit::~unit()
 	if(itor != units_with_cache.end()) {
 		units_with_cache.erase(itor);
 	}
+	} catch (...) {}
 }