diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 55a06f83264352df3e4ae06b2078b198d172bfe3..d694bd3df4fb3fcc0b2bd4942260dbb22a7f252f 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1431,10 +1431,16 @@ namespace LLError
 		if (site.mLevel == LEVEL_ERROR)
 		{
 			g->mFatalMessage = message;
+// [SL:KB] - Patch: Viewer-Build | Checked: Catznip-2.4
+#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
+			DebugBreak();
+#else
             if (s->mCrashFunction)
             {
                 s->mCrashFunction(message);
             }
+#endif // !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
+// [/SL:KB]
 		}
 	}
 }
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 e7d5a4dc2c2af0f7c6a9f65ff8b779f4928897c9..254bf05d0558eec592a770c86d8c31c79431970d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2216,14 +2216,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()