1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
index da7bc6355c..75ddff9d7d 100644
--- a/indra/llcommon/tests/llsingleton_test.cpp
+++ b/indra/llcommon/tests/llsingleton_test.cpp
@@ -311,7 +311,11 @@ namespace tut
         virtual void initSingleton()
         {
             // never mind indirection, just go straight for the circularity
-            (void)instance();
+            CircularPInit *pt = getInstance();
+            if (!pt)
+            {
+                throw;
+            }
         }
     };