diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 7476ab1c5fb06c3e7b81a8e3fa9df286ac1f54f2..5592cd3e597f00060d823d5475e2cf0da9f62362 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1167,11 +1167,18 @@ bool LLAppViewer::init()
 	// ForceAddressSize
 	updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize")));
 
-	// Run the updater. An exception from launching the updater should bother us.
-	if (!beingDebugged())
+#if LL_WINDOWS && !LL_RELEASE_FOR_DOWNLOAD && !LL_SEND_CRASH_REPORTS
+	// This is neither a release package, nor crash-reporting enabled test build
+	// try to run version updater, but don't bother if it fails (file might be missing)
+	LLLeap *leap_p = LLLeap::create(updater, false);
+	if (!leap_p)
 	{
-		LLLeap::create(updater, true);
+		LL_WARNS("LLLeap") << "Failed to run LLLeap" << LL_ENDL;
 	}
+#else
+	// Run the updater. An exception from launching the updater should bother us.
+	LLLeap::create(updater, true);
+#endif
 
 	// Iterate over --leap command-line options. But this is a bit tricky: if
 	// there's only one, it won't be an array at all.