diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 604e45f31489ae59a0330258ac0bd5da557ab342..a812a5e518b90c85ee5cfba9ac4f6b7af61dbfb7 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -231,6 +231,7 @@
 #include "llcoproceduremanager.h"
 #include "llviewereventrecorder.h"
 
+#include <stdexcept>
 
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either 
@@ -5512,8 +5513,7 @@ void LLAppViewer::forceErrorInfiniteLoop()
 void LLAppViewer::forceErrorSoftwareException()
 {
    	LL_WARNS() << "Forcing a deliberate exception" << LL_ENDL;
-    // *FIX: Any way to insure it won't be handled?
-    throw; 
+    throw std::runtime_error("User selected Force Software Exception");
 }
 
 void LLAppViewer::forceErrorDriverCrash()