diff --git a/src/unit.cpp b/src/unit.cpp
index f636ec92d7c5..9c7530926d60 100644
--- a/src/unit.cpp
+++ b/src/unit.cpp
@@ -2944,6 +2944,7 @@ unit_movement_resetter::unit_movement_resetter(unit &u, bool operate) :
 unit_movement_resetter::~unit_movement_resetter()
 {
 	assert(resources::units);
+	try {
 
 	if(!resources::units->has_unit(&u_)) {
 		/*
@@ -2953,6 +2954,8 @@ unit_movement_resetter::~unit_movement_resetter()
 		DBG_UT << "The unit to be removed is not in the unit map.\n";
 	}
 	u_.set_movement(moves_);
+
+	} catch (...) {}
 }
 
 bool unit::matches_id(const std::string& unit_id) const