diff --git a/src/libCom/osi/osiMutex.h b/src/libCom/osi/osiMutex.h
index 7eda60ed3..2cbba7087 100644
--- a/src/libCom/osi/osiMutex.h
+++ b/src/libCom/osi/osiMutex.h
@@ -30,6 +30,16 @@ private:
     mutable semMutexId id;
 };
 
+// Automatically applies and releases the mutex.
+// This is for use in situations where C++ exceptions are possible.
+class osiAutoMutex {
+public:
+    osiAutoMutex ( osiMutex & );
+    ~osiAutoMutex ();
+private:
+    osiMutex &mutex;
+};
+
 inline osiMutex::osiMutex ()
 {
     this->id = semMutexCreate ();
@@ -94,4 +104,15 @@ inline void osiMutex::show (unsigned level) const
     semMutexShow (this->id, level);
 }
 
+inline osiAutoMutex::osiAutoMutex ( osiMutex &mutexIn ) :
+    mutex ( mutexIn )
+{
+    this->mutex.lock ();
+}
+
+inline osiAutoMutex::~osiAutoMutex ()
+{
+    this->mutex.unlock ();
+}
+
 #endif /* osiMutexh */