diff --git a/hoot-core/src/main/cpp/hoot/core/util/HootException.cpp b/hoot-core/src/main/cpp/hoot/core/util/HootException.cpp
index 5e39e47..34d24c8 100644
--- a/hoot-core/src/main/cpp/hoot/core/util/HootException.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/util/HootException.cpp
@@ -22,7 +22,7 @@
* This will properly maintain the copyright information. DigitalGlobe
* copyrights will be updated automatically.
*
- * @copyright Copyright (C) 2015, 2016, 2017, 2018 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2020 DigitalGlobe (http://www.digitalglobe.com/)
*/
#include "HootException.h"
@@ -42,15 +42,11 @@ HOOT_REGISTER_EXCEPTION(NeedsReviewException)
HOOT_REGISTER_EXCEPTION(UnsupportedException)
HOOT_REGISTER_EXCEPTION(NotImplementedException)
-HootExceptionThrower* HootExceptionThrower::_theInstance = 0;
-
HootExceptionThrower& HootExceptionThrower::getInstance()
{
- if (_theInstance == 0)
- {
- _theInstance = new HootExceptionThrower();
- }
- return *_theInstance;
+ // Local static singleton instance
+ static HootExceptionThrower instance;
+ return instance;
}
void HootExceptionThrower::rethrowPointer(HootException* e)