diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 8355df90454588f486871460b39a5e4e8c3a5219..484054d6a2208a76e380871d2364d9716d08af39 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1360,7 +1360,12 @@ namespace LLError
 			return;
 		}
 
+// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-2.4
+#if LL_RELEASE_FOR_DOWNLOAD || !LL_WINDOWS
 		Globals* g = Globals::getInstance();
+#endif // LL_RELEASE_FOR_DOWNLOAD || !LL_WINDOWS
+// [/SL:KB]
+//		Globals* g = Globals::getInstance();
 		SettingsConfigPtr s = Settings::getInstance()->getSettingsConfig();
 
 		std::string message = out.str();
@@ -1396,8 +1401,16 @@ namespace LLError
 
 		if (site.mLevel == LEVEL_ERROR)
 		{
+// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-2.4
+#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
+		    DebugBreak();
+#else
 			g->mFatalMessage = message;
 			s->mCrashFunction(message);
+#endif // !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
+// [/SL:KB]
+//			g->mFatalMessage = message;
+//			s->mCrashFunction(message);
 		}
 	}
 }
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index d439136ca8525721ee0917f388ad12053e672bd2..a36cde3e10a01c968d1cd9083006afb313d98225 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -381,12 +381,24 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 #define LL_NEWLINE '\n'
 
 // Use this only in LL_ERRS or in a place that LL_ERRS may not be used
+// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-2.4
+#if !LL_RELEASE_FOR_DOWNLOAD
+#define LLERROR_CRASH         ;
+#else
 #define LLERROR_CRASH         \
 {                             \
     int* make_me_crash = NULL;\
     *make_me_crash = 0;       \
     exit(*make_me_crash);     \
 }
+#endif // !LL_RELEASE_FOR_DOWNLOAD
+// [/SL:KB]
+//#define LLERROR_CRASH         \
+//{                             \
+//    int* make_me_crash = NULL;\
+//    *make_me_crash = 0;       \
+//    exit(*make_me_crash);     \
+//}
 
 #define LL_ENDL                                         \
             LLError::End();                             \
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 850ecc8b08e99b2ee2c7b2910898a342a1b83e2f..69606793db877849360f2937e800cc096df5bc00 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2238,14 +2238,6 @@ void errorCallback(LLError::ELevel level, const std::string &error_string)
         // static info file.
         LLAppViewer::instance()->writeDebugInfo();
     }
-    
-// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-2.4
-#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
-	DebugBreak();
-#else
-	LLError::crashAndLoop(error_string);
-#endif // LL_RELEASE_WITH_DEBUG_INFO && LL_WINDOWS
-// [/SL:KB]
 }
 
 void LLAppViewer::initLoggingAndGetLastDuration()