diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 73a58fee16784f61a7bee9c2ddac214c3c295b9a..118edb8beb684656b3ec92ca9aa169b772bcc50b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2212,7 +2212,9 @@ void errorCallback(const std::string &error_string)
 	// static info file.
 	LLAppViewer::instance()->writeDebugInfo();
 
+#ifndef SHADER_CRASH_NONFATAL
 	LLError::crashAndLoop(error_string);
+#endif
 }
 
 void LLAppViewer::initLoggingAndGetLastDuration()