From be452dd2f2d906061f9de5bfb46fa43bcdec40ed Mon Sep 17 00:00:00 2001
From: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Date: Tue, 28 May 2024 05:07:24 +0200
Subject: [PATCH] rename CrashIf() => ReportIf

---
 src/Accelerators.cpp            |  10 +--
 src/Annotation.cpp              |  16 ++---
 src/AppColors.cpp               |   2 +-
 src/AppSettings.cpp             |  10 +--
 src/Canvas.cpp                  |  22 +++----
 src/CanvasAboutUI.cpp           |   2 +-
 src/ChmFile.cpp                 |   8 +--
 src/ChmModel.cpp                |  20 +++---
 src/CommandPalette.cpp          |  12 ++--
 src/Commands.cpp                |   2 +-
 src/CrashHandler.cpp            |   2 +-
 src/DisplayMode.cpp             |   4 +-
 src/DisplayModel.cpp            |  86 ++++++++++++-------------
 src/DocController.h             |   2 +-
 src/DocProperties.cpp           |   4 +-
 src/EbookDoc.cpp                |  12 ++--
 src/EbookFormatter.cpp          |  16 ++---
 src/EditAnnotations.cpp         |  32 +++++-----
 src/EngineBase.cpp              |   6 +-
 src/EngineBase.h                |   4 +-
 src/EngineCreate.cpp            |   2 +-
 src/EngineDjVu.cpp              |  22 +++----
 src/EngineDump.cpp              |   2 +-
 src/EngineEbook.cpp             |  24 +++----
 src/EngineImages.cpp            |  26 ++++----
 src/EngineMulti.cpp             |  10 +--
 src/EngineMupdf.cpp             |  84 ++++++++++++------------
 src/EnginePs.cpp                |   2 +-
 src/ExternalViewers.cpp         |   2 +-
 src/Favorites.cpp               |  18 +++---
 src/FileHistory.cpp             |   8 +--
 src/FileThumbnails.cpp          |   4 +-
 src/Flags.cpp                   |   2 +-
 src/GlobalPrefs.cpp             |   2 +-
 src/HomePage.cpp                |  10 +--
 src/HtmlFormatter.cpp           |  58 ++++++++---------
 src/HtmlFormatter.h             |   2 +-
 src/Installer.cpp               |   6 +-
 src/MainWindow.cpp              |  22 +++----
 src/Menu.cpp                    |  28 ++++----
 src/MobiDoc.cpp                 |  28 ++++----
 src/Notifications.cpp           |  10 +--
 src/PalmDbReader.cpp            |   6 +-
 src/PdfCreator.cpp              |   4 +-
 src/PdfSync.cpp                 |   6 +-
 src/RegistryInstaller.cpp       |   2 +-
 src/RenderCache.cpp             |  52 +++++++--------
 src/Scratch.cpp                 |  10 +--
 src/SearchAndDDE.cpp            |  12 ++--
 src/Selection.cpp               |  16 ++---
 src/StressTesting.cpp           |  12 ++--
 src/SumatraDialogs.cpp          |  16 ++---
 src/SumatraPDF.cpp              | 109 +++++++++++++++++---------------
 src/SumatraProperties.cpp       |  14 ++--
 src/SumatraStartup.cpp          |  24 +++----
 src/SvgIcons.cpp                |   2 +-
 src/TableOfContents.cpp         |  18 +++---
 src/Tabs.cpp                    |  16 ++---
 src/TextSearch.cpp              |   2 +-
 src/TextSelection.cpp           |  16 ++---
 src/Theme.cpp                   |   2 +-
 src/Toolbar.cpp                 |   4 +-
 src/Translations.cpp            |  16 ++---
 src/Uninstaller.cpp             |   2 +-
 src/UpdateCheck.cpp             |   4 +-
 src/Widget.cpp                  |   2 +-
 src/WindowTab.cpp               |  10 +--
 src/ifilter/SearchFilterDll.cpp |   2 +-
 src/mui/Mui.cpp                 |  14 ++--
 src/mui/TextRender.cpp          |  38 +++++------
 src/previewer/PdfPreviewDll.cpp |   2 +-
 src/regress/Regress.cpp         |   4 +-
 src/regress/Regress03.cpp       |  10 +--
 src/scratch.txt                 |   2 +-
 src/testcode/TestApp.cpp        |   4 +-
 src/testcode/test-app.cpp       |   6 +-
 src/tools/MakeLzSA.cpp          |  12 ++--
 src/uia/DocumentProvider.cpp    |  18 +++---
 src/uia/PageProvider.cpp        |   4 +-
 src/uia/Provider.cpp            |   4 +-
 src/uia/StartPageProvider.cpp   |   4 +-
 src/uia/TextRange.cpp           |  14 ++--
 src/utils/Archive.cpp           |  16 ++---
 src/utils/BaseUtil.cpp          |  22 +++----
 src/utils/BaseUtil.h            |   6 +-
 src/utils/BitReader.cpp         |   2 +-
 src/utils/ColorUtil.cpp         |   2 +-
 src/utils/CryptoUtil.cpp        |  20 +++---
 src/utils/CssParser.cpp         |   6 +-
 src/utils/DbgHelpDyn.cpp        |   2 +-
 src/utils/Dict.cpp              |   8 +--
 src/utils/DirIter.cpp           |   4 +-
 src/utils/Dpi.cpp               |   2 +-
 src/utils/FileUtil.cpp          |   8 +--
 src/utils/FileWatcher.cpp       |  16 ++---
 src/utils/GdiPlusUtil.cpp       |  20 +++---
 src/utils/GeomUtil.cpp          |   2 +-
 src/utils/GuessFileType.cpp     |   2 +-
 src/utils/HtmlPrettyPrint.cpp   |   2 +-
 src/utils/HtmlPullParser.cpp    |  12 ++--
 src/utils/HtmlWindow.cpp        |  50 +++++++--------
 src/utils/Log.cpp               |   2 +-
 src/utils/ScopedWin.h           |   8 +--
 src/utils/SettingsUtil.cpp      |  16 ++---
 src/utils/SquareTreeParser.cpp  |   2 +-
 src/utils/StrFormat.cpp         |  28 ++++----
 src/utils/StrQueue.cpp          |   2 +-
 src/utils/StrUtil.cpp           |  36 +++++------
 src/utils/StrVec.cpp            |  26 ++++----
 src/utils/StrconvUtil.cpp       |   4 +-
 src/utils/TempAllocator.cpp     |   4 +-
 src/utils/TgaReader.cpp         |   4 +-
 src/utils/ThreadUtil.cpp        |   2 +-
 src/utils/TrivialHtmlParser.cpp |   6 +-
 src/utils/UITask.cpp            |   4 +-
 src/utils/Vec.h                 |  30 ++++-----
 src/utils/WinUtil.cpp           |  62 +++++++++---------
 src/utils/ZipUtil.cpp           |  14 ++--
 src/utils/tests/Dict_ut.cpp     |   4 +-
 src/utils/windrawlib.cpp        |   2 +-
 src/wingui/FrameRateWnd.cpp     |   4 +-
 src/wingui/Layout.cpp           |  16 ++---
 src/wingui/WinGui.cpp           | 108 +++++++++++++++----------------
 123 files changed, 874 insertions(+), 871 deletions(-)

diff --git a/src/Accelerators.cpp b/src/Accelerators.cpp
index 49ef6136fa6..db482cb37bd 100644
--- a/src/Accelerators.cpp
+++ b/src/Accelerators.cpp
@@ -266,7 +266,7 @@ static WORD ParseVirtKey(const char* s) {
     if (idx < 0) {
         return 0;
     }
-    CrashIf(idx >= dimof(gVirtKeysIds));
+    ReportIf(idx >= dimof(gVirtKeysIds));
     WORD keyId = gVirtKeysIds[idx];
     return keyId;
 }
@@ -600,7 +600,7 @@ static HACCEL gAccelTables[3] = {
 /* returns a pointer to HACCEL so that we can update it and message loop will use
 the latest version */
 static void CreateSumatraAcceleratorTable() {
-    CrashIf(gAccelTables[0] || gAccelTables[1] || gAccelTables[2]);
+    ReportIf(gAccelTables[0] || gAccelTables[1] || gAccelTables[2]);
 
     int nBuiltIn = (int)dimof(gBuiltInAccelerators);
 
@@ -671,11 +671,11 @@ static void CreateSumatraAcceleratorTable() {
     gAccelsCount = nAccels;
 
     gAccelTables[0] = CreateAcceleratorTableW(gAccels, gAccelsCount);
-    CrashIf(gAccelTables[0] == nullptr);
+    ReportIf(gAccelTables[0] == nullptr);
     gAccelTables[1] = CreateAcceleratorTableW(editAccels, nEditAccels);
-    CrashIf(gAccelTables[1] == nullptr);
+    ReportIf(gAccelTables[1] == nullptr);
     gAccelTables[2] = CreateAcceleratorTableW(treeViewAccels, nTreeViewAccels);
-    CrashIf(gAccelTables[2] == nullptr);
+    ReportIf(gAccelTables[2] == nullptr);
 
     free(toFreeAccels);
 }
diff --git a/src/Annotation.cpp b/src/Annotation.cpp
index 836588d68ed..cfba5f4943a 100644
--- a/src/Annotation.cpp
+++ b/src/Annotation.cpp
@@ -109,12 +109,12 @@ static const char* gAnnotReadableNames =
 /*
 const char* AnnotationName(AnnotationType tp) {
     int n = (int)tp;
-    CrashIf(n < -1 || n > (int)AnnotationType::ThreeD);
+    ReportIf(n < -1 || n > (int)AnnotationType::ThreeD);
     if (n < 0) {
         return "Unknown";
     }
     const char* s = seqstrings::IdxToStr(gAnnotNames, n);
-    CrashIf(!s);
+    ReportIf(!s);
     return s;
 }
 */
@@ -132,7 +132,7 @@ TempStr AnnotationReadableNameTemp(AnnotationType tp) {
         return (char*)"Unknown";
     }
     char* s = (char*)seqstrings::IdxToStr(gAnnotReadableNames, n);
-    CrashIf(!s);
+    ReportIf(!s);
     return s;
 }
 
@@ -144,12 +144,12 @@ bool IsAnnotationEq(Annotation* a1, Annotation* a2) {
 }
 
 AnnotationType Type(Annotation* annot) {
-    CrashIf((int)annot->type < 0);
+    ReportIf((int)annot->type < 0);
     return annot->type;
 }
 
 int PageNo(Annotation* annot) {
-    CrashIf(annot->pageNo < 1);
+    ReportIf(annot->pageNo < 1);
     return annot->pageNo;
 }
 
@@ -246,7 +246,7 @@ bool SetQuadding(Annotation* annot, int newQuadding) {
     {
         auto ctx = e->Ctx();
         ScopedCritSec cs(e->ctxAccess);
-        CrashIf(!IsValidQuadding(newQuadding));
+        ReportIf(!IsValidQuadding(newQuadding));
         bool didChange = Quadding(annot) != newQuadding;
         if (!didChange) {
             return false;
@@ -513,7 +513,7 @@ static PdfColor PdfColorFromFloat(fz_context* ctx, int n, float color[4]) {
         }
         return MkPdfColorFromFloat(rgb[0], rgb[1], rgb[2]);
     }
-    CrashIf(true);
+    ReportIf(true);
     return 0;
 }
 
@@ -872,7 +872,7 @@ void SetOpacity(Annotation* annot, int newOpacity) {
     {
         auto ctx = e->Ctx();
         ScopedCritSec cs(e->ctxAccess);
-        CrashIf(newOpacity < 0 || newOpacity > 255);
+        ReportIf(newOpacity < 0 || newOpacity > 255);
         newOpacity = std::clamp(newOpacity, 0, 255);
         float fopacity = (float)newOpacity / 255.f;
 
diff --git a/src/AppColors.cpp b/src/AppColors.cpp
index 770f0ca46a9..a988b9fbbdb 100644
--- a/src/AppColors.cpp
+++ b/src/AppColors.cpp
@@ -28,6 +28,6 @@
 #define ABOUT_BG_GRAY_COLOR RGB(0xF2, 0xF2, 0xF2)
 
 COLORREF GetAppColor(AppColor col) {
-    CrashIf(true);
+    ReportIf(true);
     return 0;
 }
diff --git a/src/AppSettings.cpp b/src/AppSettings.cpp
index 11d9eb0a983..2b90777e40f 100644
--- a/src/AppSettings.cpp
+++ b/src/AppSettings.cpp
@@ -61,7 +61,7 @@ static int GetWeekCount() {
     date20110101.wDay = 1;
     FILETIME origTime, currTime;
     BOOL ok = SystemTimeToFileTime(&date20110101, &origTime);
-    CrashIf(!ok);
+    ReportIf(!ok);
     GetSystemTimeAsFileTime(&currTime);
     return (currTime.dwHighDateTime - origTime.dwHighDateTime) / 1408;
     // 1408 == (10 * 1000 * 1000 * 60 * 60 * 24 * 7) / (1 << 32)
@@ -96,7 +96,7 @@ static void setMinMax(int& i, int minVal, int maxVal) {
 
 /* Caller needs to CleanUpSettings() */
 bool LoadSettings() {
-    CrashIf(gGlobalPrefs);
+    ReportIf(gGlobalPrefs);
 
     auto timeStart = TimeGet();
 
@@ -118,7 +118,7 @@ bool LoadSettings() {
     gprefs->lastPrefUpdate = file::GetModificationTime(settingsPath);
     gprefs->defaultDisplayModeEnum = DisplayModeFromString(gprefs->defaultDisplayMode, DisplayMode::Automatic);
     gprefs->defaultZoomFloat = ZoomFromString(gprefs->defaultZoom, kZoomActualSize);
-    CrashIf(!IsValidZoom(gprefs->defaultZoomFloat));
+    ReportIf(!IsValidZoom(gprefs->defaultZoomFloat));
 
     int weekDiff = GetWeekCount() - gprefs->openCountWeek;
     gprefs->openCountWeek = GetWeekCount();
@@ -272,7 +272,7 @@ bool SaveSettings() {
         str::Free(prevPrefs.data());
         str::Free(prefs.data());
     };
-    CrashIf(prefs.empty());
+    ReportIf(prefs.empty());
     if (prefs.empty()) {
         return false;
     }
@@ -371,7 +371,7 @@ void RegisterSettingsForFileChanges() {
         return;
     }
 
-    CrashIf(gWatchedSettingsFile); // only call me once
+    ReportIf(gWatchedSettingsFile); // only call me once
     TempStr path = GetSettingsPathTemp();
     gWatchedSettingsFile = FileWatcherSubscribe(path, schedulePrefsReload);
 }
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index 2b26191d436..471f2807875 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -89,7 +89,7 @@ void UpdateDeltaPerLine() {
 ///// methods needed for FixedPageUI canvases with document loaded /////
 
 static void OnVScroll(MainWindow* win, WPARAM wp) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
 
     SCROLLINFO si{};
     si.cbSize = sizeof(si);
@@ -154,7 +154,7 @@ static void OnVScroll(MainWindow* win, WPARAM wp) {
 }
 
 static void OnHScroll(MainWindow* win, WPARAM wp) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
 
     SCROLLINFO si{};
     si.cbSize = sizeof(si);
@@ -307,7 +307,7 @@ static bool gShowAnnotationNotification = true;
 
 static void OnMouseMove(MainWindow* win, int x, int y, WPARAM) {
     DisplayModel* dm = win->AsFixed();
-    CrashIf(!dm);
+    ReportIf(!dm);
 
     if (win->InPresentation()) {
         if (PM_BLACK_SCREEN == win->presentation || PM_WHITE_SCREEN == win->presentation) {
@@ -471,7 +471,7 @@ static void OnMouseLeftButtonDown(MainWindow* win, int x, int y, WPARAM key) {
     if (isMoveableAnnot) {
         StartAnnotationDrag(win, annot, pt);
     } else {
-        CrashIf(win->linkOnLastButtonDown);
+        ReportIf(win->linkOnLastButtonDown);
         IPageElement* pageEl = dm->GetElementAtPos(pt, nullptr);
         if (pageEl) {
             if (pageEl->Is(kindPageElementDest)) {
@@ -502,7 +502,7 @@ static void OnMouseLeftButtonDown(MainWindow* win, int x, int y, WPARAM key) {
 
 static void OnMouseLeftButtonUp(MainWindow* win, int x, int y, WPARAM key) {
     DisplayModel* dm = win->AsFixed();
-    CrashIf(!dm);
+    ReportIf(!dm);
     auto ma = win->mouseAction;
     if (MouseAction::None == ma || IsRightDragging(win)) {
         return;
@@ -691,7 +691,7 @@ static void OnMouseRightButtonDown(MainWindow* win, int x, int y) {
     } else if (win->mouseAction != MouseAction::None) {
         return;
     }
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
 
     SetFocus(win->hwndFrame);
 
@@ -702,7 +702,7 @@ static void OnMouseRightButtonDown(MainWindow* win, int x, int y) {
 }
 
 static void OnMouseRightButtonUp(MainWindow* win, int x, int y, WPARAM key) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     if (!IsRightDragging(win)) {
         return;
     }
@@ -883,7 +883,7 @@ NO_INLINE static void PaintCurrentEditAnnotationMark(WindowTab* tab, HDC hdc, Di
 }
 
 static void DrawDocument(MainWindow* win, HDC hdc, RECT* rcArea) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     if (!win->AsFixed()) {
         return;
     }
@@ -970,7 +970,7 @@ static void DrawDocument(MainWindow* win, HDC hdc, RECT* rcArea) {
         if (!pageInfo || 0.0f == pageInfo->visibleRatio) {
             continue;
         }
-        CrashIf(!pageInfo->shown);
+        ReportIf(!pageInfo->shown);
         if (!pageInfo->shown) {
             continue;
         }
@@ -1121,7 +1121,7 @@ static LRESULT OnSetCursorMouseNone(MainWindow* win, HWND hwnd) {
 }
 
 static LRESULT OnSetCursor(MainWindow* win, HWND hwnd) {
-    CrashIf(win->hwndCanvas != hwnd);
+    ReportIf(win->hwndCanvas != hwnd);
     if (win->mouseAction != MouseAction::None) {
         win->DeleteToolTip();
     }
@@ -1851,7 +1851,7 @@ LRESULT CALLBACK WndProcCanvas(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
     MainWindow* win = FindMainWindowByHwnd(hwnd);
     switch (msg) {
         case WM_DROPFILES:
-            CrashIf(lp != 0 && lp != 1);
+            ReportIf(lp != 0 && lp != 1);
             OnDropFiles(win, (HDROP)wp, !lp);
             return 0;
 
diff --git a/src/CanvasAboutUI.cpp b/src/CanvasAboutUI.cpp
index e09cfe208e6..40fb7e29f9d 100644
--- a/src/CanvasAboutUI.cpp
+++ b/src/CanvasAboutUI.cpp
@@ -89,7 +89,7 @@ static void OnMouseLeftButtonUpAbout(MainWindow* win, int x, int y, WPARAM) {
     } else {
         // assume it's a thumbnail of a document
         auto path = url;
-        CrashIf(!path);
+        ReportIf(!path);
         LoadArgs args(path, win);
         // ctrl forces always opening
         args.activateExisting = !IsCtrlPressed();
diff --git a/src/ChmFile.cpp b/src/ChmFile.cpp
index a9d8856b363..6ee23ee9361 100644
--- a/src/ChmFile.cpp
+++ b/src/ChmFile.cpp
@@ -96,7 +96,7 @@ static char* GetCharZ(const ByteSlice& d, size_t off) {
     if (off >= len) {
         return nullptr;
     }
-    CrashIf(!memchr(data + off, '\0', len - off + 1)); // data is zero-terminated
+    ReportIf(!memchr(data + off, '\0', len - off + 1)); // data is zero-terminated
     u8* str = data + off;
     if (str::IsEmpty((const char*)str)) {
         return nullptr;
@@ -367,7 +367,7 @@ void ChmFile::GetAllPaths(StrVec* v) const {
   ... siblings ...
 */
 static bool VisitChmTocItem(EbookTocVisitor* visitor, HtmlElement* el, uint cp, int level) {
-    CrashIf(el->tag != Tag_Object || level > 1 && (!el->up || el->up->tag != Tag_Li));
+    ReportIf(el->tag != Tag_Object || level > 1 && (!el->up || el->up->tag != Tag_Li));
 
     AutoFreeWStr name, local;
     for (el = el->GetChildByTag(Tag_Param); el; el = el->next) {
@@ -416,7 +416,7 @@ static bool VisitChmTocItem(EbookTocVisitor* visitor, HtmlElement* el, uint cp,
   ... siblings ...
 */
 static bool VisitChmIndexItem(EbookTocVisitor* visitor, HtmlElement* el, uint cp, int level) {
-    CrashIf(el->tag != Tag_Object || level > 1 && (!el->up || el->up->tag != Tag_Li));
+    ReportIf(el->tag != Tag_Object || level > 1 && (!el->up || el->up->tag != Tag_Li));
 
     StrVec references;
     AutoFreeWStr keyword, name;
@@ -471,7 +471,7 @@ static bool VisitChmIndexItem(EbookTocVisitor* visitor, HtmlElement* el, uint cp
 }
 
 static void WalkChmTocOrIndex(EbookTocVisitor* visitor, HtmlElement* list, uint cp, bool isIndex, int level = 1) {
-    CrashIf(Tag_Ul != list->tag);
+    ReportIf(Tag_Ul != list->tag);
 
     // some broken ToCs wrap every <li> into its own <ul>
     for (; list && Tag_Ul == list->tag; list = list->next) {
diff --git a/src/ChmModel.cpp b/src/ChmModel.cpp
index ba87a5eccc4..8571ecdc958 100644
--- a/src/ChmModel.cpp
+++ b/src/ChmModel.cpp
@@ -35,7 +35,7 @@ static IPageDestination* NewChmNamedDest(const char* url, int pageNo) {
         dest = pdest;
     }
     dest->pageNo = pageNo;
-    CrashIf(!dest->kind);
+    ReportIf(!dest->kind);
     dest->rect = RectF(DEST_USE_DEFAULT, DEST_USE_DEFAULT, DEST_USE_DEFAULT, DEST_USE_DEFAULT);
     return dest;
 }
@@ -126,7 +126,7 @@ void ChmModel::GoToPage(int pageNo, bool) {
 }
 
 bool ChmModel::SetParentHwnd(HWND hwnd) {
-    CrashIf(htmlWindow || htmlWindowCb);
+    ReportIf(htmlWindow || htmlWindowCb);
     htmlWindowCb = new HtmlWindowHandler(this);
     htmlWindow = HtmlWindow::Create(hwnd, htmlWindowCb);
     if (!htmlWindow) {
@@ -221,7 +221,7 @@ bool ChmModel::DisplayPage(const char* pageUrl) {
 }
 
 void ChmModel::ScrollTo(int, RectF, float) {
-    CrashIf(true);
+    ReportIf(true);
 }
 
 bool ChmModel::HandleLink(IPageDestination* link, ILinkHandler*) {
@@ -331,9 +331,9 @@ class ChmTocBuilder : public EbookTocVisitor {
         bool inserted = urlsSet.Insert(plainUrl, pageNo, &pageNo);
         if (inserted) {
             pages->Append(plainUrl);
-            CrashIf(pageNo != pages->Size());
+            ReportIf(pageNo != pages->Size());
         } else {
-            CrashIf(pageNo == pages->Size() + 1);
+            ReportIf(pageNo == pages->Size() + 1);
         }
         return pageNo;
     }
@@ -348,7 +348,7 @@ class ChmTocBuilder : public EbookTocVisitor {
         for (int i = 0; i < n; i++) {
             const char* url = pages->At(i);
             bool inserted = urlsSet.Insert(url, i + 1, nullptr);
-            CrashIf(!inserted);
+            ReportIf(!inserted);
         }
     }
 
@@ -377,7 +377,7 @@ bool ChmModel::Load(const char* fileName) {
     tocTrace = new Vec<ChmTocTraceItem>();
     ChmTocBuilder tmpTocBuilder(doc, &pages, tocTrace, &poolAlloc);
     doc->ParseToc(&tmpTocBuilder);
-    CrashIf(pages.Size() == 0);
+    ReportIf(pages.Size() == 0);
     return pages.Size() > 0;
 }
 
@@ -541,7 +541,7 @@ TocTree* ChmModel::GetToc() {
         TocItem* item = NewChmTocItem(nullptr, ti.title, ti.pageNo, ti.url);
         item->id = ++idCounter;
         // append the item at the correct level
-        CrashIf(ti.level < 1);
+        ReportIf(ti.level < 1);
         if ((size_t)ti.level <= levels.size()) {
             levels.RemoveAt(ti.level, levels.size() - ti.level);
             levels.Last()->AddSiblingAtEnd(item);
@@ -577,8 +577,8 @@ float ChmModel::GetNextZoomStep(float towardsLevel) const {
     }
 
     Vec<float>* zoomLevels = gGlobalPrefs->zoomLevels;
-    CrashIf(zoomLevels->size() != 0 && (zoomLevels->at(0) < kZoomMin || zoomLevels->Last() > kZoomMax));
-    CrashIf(zoomLevels->size() != 0 && zoomLevels->at(0) > zoomLevels->Last());
+    ReportIf(zoomLevels->size() != 0 && (zoomLevels->at(0) < kZoomMin || zoomLevels->Last() > kZoomMax));
+    ReportIf(zoomLevels->size() != 0 && zoomLevels->at(0) > zoomLevels->Last());
 
     const float FUZZ = 0.01f;
     float newZoom = towardsLevel;
diff --git a/src/CommandPalette.cpp b/src/CommandPalette.cpp
index 1234bd21bad..ec245ad1f8a 100644
--- a/src/CommandPalette.cpp
+++ b/src/CommandPalette.cpp
@@ -435,7 +435,7 @@ void CommandPaletteWnd::CollectStrings(MainWindow* mainWin) {
     int cmdId = (int)CmdFirst + 1;
     for (SeqStrings strs = gCommandDescriptions; strs; seqstrings::Next(strs, cmdId)) {
         if (AllowCommand(ctx, (i32)cmdId)) {
-            CrashIf(str::Leni(strs) == 0);
+            ReportIf(str::Leni(strs) == 0);
             tempStrings.Append(strs);
         }
     }
@@ -733,7 +733,7 @@ bool CommandPaletteWnd::Create(MainWindow* win, const char* prefix) {
         c->maxDx = 150;
         c->onTextChanged = std::bind(&CommandPaletteWnd::QueryChanged, this);
         HWND ok = c->Create(args);
-        CrashIf(!ok);
+        ReportIf(!ok);
         editQuery = c;
         vbox->AddChild(c);
     }
@@ -747,7 +747,7 @@ bool CommandPaletteWnd::Create(MainWindow* win, const char* prefix) {
         c->idealSizeLines = 32;
         c->SetInsetsPt(4, 0);
         auto wnd = c->Create(args);
-        CrashIf(!wnd);
+        ReportIf(!wnd);
         auto m = new ListBoxModelStrings();
         FilterStringsForQuery("", m->strings);
         c->SetModel(m);
@@ -763,7 +763,7 @@ bool CommandPaletteWnd::Create(MainWindow* win, const char* prefix) {
 
         auto c = new Static();
         auto wnd = c->Create(args);
-        CrashIf(!wnd);
+        ReportIf(!wnd);
         staticHelp = c;
         vbox->AddChild(c);
     }
@@ -794,13 +794,13 @@ bool CommandPaletteWnd::Create(MainWindow* win, const char* prefix) {
 }
 
 void RunCommandPallette(MainWindow* win, const char* prefix) {
-    CrashIf(gCommandPaletteWnd);
+    ReportIf(gCommandPaletteWnd);
 
     auto wnd = new CommandPaletteWnd();
     wnd->font = GetAppBiggerFont();
     wnd->win = win;
     bool ok = wnd->Create(win, prefix);
-    CrashIf(!ok);
+    ReportIf(!ok);
     gCommandPaletteWnd = wnd;
     gHwndToActivateOnClose = win->hwndFrame;
 }
diff --git a/src/Commands.cpp b/src/Commands.cpp
index 8a1cc32454d..7f9718b19b9 100644
--- a/src/Commands.cpp
+++ b/src/Commands.cpp
@@ -23,7 +23,7 @@ static NO_INLINE int GetCommandIdByNameOrDesc(SeqStrings commands, const char* s
     if (idx < 0) {
         return -1;
     }
-    CrashIf(idx >= dimof(gCommandIds));
+    ReportIf(idx >= dimof(gCommandIds));
     int cmdId = gCommandIds[idx];
     return (int)cmdId;
 }
diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp
index 03df7bd2890..4113f380a6e 100644
--- a/src/CrashHandler.cpp
+++ b/src/CrashHandler.cpp
@@ -708,7 +708,7 @@ static char* BuildSymbolsUrl() {
 }
 
 void InstallCrashHandler(const char* crashDumpPath, const char* crashFilePath, const char* symDir) {
-    CrashIf(gDumpEvent || gDumpThread);
+    ReportIf(gDumpEvent || gDumpThread);
 
     if (!crashDumpPath) {
         log("InstallCrashHandler: skipping because !crashDumpPath\n");
diff --git a/src/DisplayMode.cpp b/src/DisplayMode.cpp
index e79d45b1883..a45417db699 100644
--- a/src/DisplayMode.cpp
+++ b/src/DisplayMode.cpp
@@ -62,7 +62,7 @@ const char* DisplayModeToString(DisplayMode mode) {
     int idx = (int)mode;
     const char* s = seqstrings::IdxToStr(displayModeNames, idx);
     if (!s) {
-        CrashIf(true);
+        ReportIf(true);
         return "unknown display mode";
     }
     return s;
@@ -112,7 +112,7 @@ void ZoomToString(char** dst, float zoom, FileState* stateForIssue2140) {
         logf("DisplayMode: %s\n", stateForIssue2140->displayMode);
         logf("PageNo: %d\n", stateForIssue2140->pageNo);
     }
-    CrashIf(!IsValidZoom(zoom));
+    ReportIf(!IsValidZoom(zoom));
     str::FreePtr(dst);
     if (kZoomFitPage == zoom) {
         *dst = str::Dup("fit page");
diff --git a/src/DisplayModel.cpp b/src/DisplayModel.cpp
index aa9ff8217b2..c515770c4f1 100644
--- a/src/DisplayModel.cpp
+++ b/src/DisplayModel.cpp
@@ -239,7 +239,7 @@ void DisplayModel::GetDisplayState(FileState* fs) {
 
 SizeF DisplayModel::PageSizeAfterRotation(int pageNo, bool fitToContent) const {
     PageInfo* pageInfo = GetPageInfo(pageNo);
-    CrashIf(!pageInfo);
+    ReportIf(!pageInfo);
 
     if (fitToContent && pageInfo->contentBox.IsEmpty()) {
         pageInfo->contentBox = engine->PageContentBox(pageNo);
@@ -283,7 +283,7 @@ static int LastPageInARowNo(int pageNo, int columns, bool showCover, int pageCou
 // must call SetInitialViewSettings() after creation
 DisplayModel::DisplayModel(EngineBase* engine, DocControllerCallback* cb) : DocController(cb) {
     this->engine = engine;
-    CrashIf(!engine || engine->PageCount() <= 0);
+    ReportIf(!engine || engine->PageCount() <= 0);
     engineType = engine->kind;
 
     if (!engine->IsImageCollection()) {
@@ -323,7 +323,7 @@ PageInfo* DisplayModel::GetPageInfo(int pageNo) const {
     if (!ValidPageNo(pageNo)) {
         return nullptr;
     }
-    CrashIf(!pagesInfo);
+    ReportIf(!pagesInfo);
     return &(pagesInfo[pageNo - 1]);
 }
 
@@ -365,7 +365,7 @@ void DisplayModel::SetInitialViewSettings(DisplayMode newDisplayMode, int newSta
 }
 
 void DisplayModel::BuildPagesInfo() {
-    CrashIf(pagesInfo);
+    ReportIf(pagesInfo);
     int pageCount = PageCount();
     pagesInfo = AllocArray<PageInfo>(pageCount);
 
@@ -511,7 +511,7 @@ float DisplayModel::ZoomRealFromVirtualForPage(float zoomVirtual, int pageNo) co
         row.dx += (double)pageSpacing.dx * (double)(columns - 1);
     }
 
-    CrashIf(RectF(PointF(), row).IsEmpty());
+    ReportIf(RectF(PointF(), row).IsEmpty());
     if (RectF(PointF(), row).IsEmpty()) {
         return 0;
     }
@@ -531,7 +531,7 @@ float DisplayModel::ZoomRealFromVirtualForPage(float zoomVirtual, int pageNo) co
 }
 
 int DisplayModel::FirstVisiblePageNo() const {
-    CrashIf(!pagesInfo);
+    ReportIf(!pagesInfo);
     if (!pagesInfo) {
         return kInvalidPageNo;
     }
@@ -554,7 +554,7 @@ int DisplayModel::CurrentPageNo() const {
         return startPage;
     }
 
-    CrashIf(!pagesInfo);
+    ReportIf(!pagesInfo);
     if (!pagesInfo) {
         return kInvalidPageNo;
     }
@@ -584,7 +584,7 @@ int DisplayModel::CurrentPageNo() const {
 }
 
 void DisplayModel::CalcZoomReal(float newZoomVirtual) {
-    CrashIf(!IsValidZoom(newZoomVirtual));
+    ReportIf(!IsValidZoom(newZoomVirtual));
     zoomVirtual = newZoomVirtual;
     int nPages = PageCount();
     if ((kZoomFitWidth == newZoomVirtual) || (kZoomFitPage == newZoomVirtual)) {
@@ -603,7 +603,7 @@ void DisplayModel::CalcZoomReal(float newZoomVirtual) {
                 }
             }
         }
-        CrashIf(minZoom == (float)HUGE_VAL);
+        ReportIf(minZoom == (float)HUGE_VAL);
         zoomReal = minZoom;
     } else if (kZoomFitContent == newZoomVirtual) {
         float newZoom = ZoomRealFromVirtualForPage(newZoomVirtual, CurrentPageNo());
@@ -656,7 +656,7 @@ float DisplayModel::GetZoomReal(int pageNo) const {
      * switching between display modes
      * navigating to another page in non-continuous mode */
 void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
-    CrashIf(!pagesInfo);
+    ReportIf(!pagesInfo);
     if (!pagesInfo) {
         return;
     }
@@ -687,7 +687,7 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
     for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
         PageInfo* pageInfo = GetPageInfo(pageNo);
         if (!pageInfo->shown) {
-            CrashIf(0.0 != pageInfo->visibleRatio);
+            ReportIf(0.0 != pageInfo->visibleRatio);
             continue;
         }
         SizeF pageSize = PageSizeAfterRotation(pageNo);
@@ -714,7 +714,7 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
         if (IsBookView(GetDisplayMode()) && pageNo == 1 && columns - pageInARow > 1) {
             pageInARow++;
         }
-        CrashIf(pageInARow >= dimof(columnMaxWidth));
+        ReportIf(pageInARow >= dimof(columnMaxWidth));
         if (columnMaxWidth[pageInARow] < pos.dx) {
             columnMaxWidth[pageInARow] = pos.dx;
         }
@@ -733,7 +733,7 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
         pageInfo->pos = pos;
 
         pageInARow++;
-        CrashIf(pageInARow > columns);
+        ReportIf(pageInARow > columns);
         if (pageInARow == columns) {
             /* starting next row */
             currPosY += rowMaxPageDy + pageSpacing.dy;
@@ -782,22 +782,22 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
         canvasDx = viewPort.dx;
     }
 
-    CrashIf(offX < 0);
+    ReportIf(offX < 0);
     pageInARow = 0;
     int pageOffX = offX + windowMargin.left;
     for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
         PageInfo* pageInfo = GetPageInfo(pageNo);
         if (!pageInfo->shown) {
-            CrashIf(0.0 != pageInfo->visibleRatio);
+            ReportIf(0.0 != pageInfo->visibleRatio);
             continue;
         }
         // leave first spot empty in cover page mode
         if (IsBookView(GetDisplayMode()) && pageNo == 1) {
-            CrashIf(pageInARow >= dimof(columnMaxWidth));
+            ReportIf(pageInARow >= dimof(columnMaxWidth));
             pageOffX += columnMaxWidth[pageInARow] + pageSpacing.dx;
             ++pageInARow;
         }
-        CrashIf(pageInARow >= dimof(columnMaxWidth));
+        ReportIf(pageInARow >= dimof(columnMaxWidth));
         // center pages in a single column but right/left align them when using two columns
         if (1 == columns) {
             pageInfo->pos.x = pageOffX + (columnMaxWidth[0] - pageInfo->pos.dx) / 2;
@@ -816,10 +816,10 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
             pageInfo->pos.x = canvasDx - pageInfo->pos.x - pageInfo->pos.dx;
         }
 
-        CrashIf(pageInARow >= dimof(columnMaxWidth));
+        ReportIf(pageInARow >= dimof(columnMaxWidth));
         pageOffX += columnMaxWidth[pageInARow] + pageSpacing.dx;
         ++pageInARow;
-        CrashIf(!(pageOffX >= 0 && pageInfo->pos.x >= 0));
+        ReportIf(!(pageOffX >= 0 && pageInfo->pos.x >= 0));
 
         if (pageInARow == columns) {
             pageOffX = offX + windowMargin.left;
@@ -836,11 +836,11 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
     /* if a page is smaller than drawing area in y axis, y-center the page */
     if (canvasDy < viewPort.dy) {
         int offY = windowMargin.top + (viewPort.dy - canvasDy) / 2;
-        CrashIf(offY < 0.0);
+        ReportIf(offY < 0.0);
         for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
             PageInfo* pageInfo = GetPageInfo(pageNo);
             if (!pageInfo->shown) {
-                CrashIf(0.0 != pageInfo->visibleRatio);
+                ReportIf(0.0 != pageInfo->visibleRatio);
                 continue;
             }
             pageInfo->pos.y += offY;
@@ -851,8 +851,8 @@ void DisplayModel::Relayout(float newZoomVirtual, int newRotation) {
 }
 
 void DisplayModel::ChangeStartPage(int newStartPage) {
-    CrashIf(!ValidPageNo(newStartPage));
-    CrashIf(IsContinuous(GetDisplayMode()));
+    ReportIf(!ValidPageNo(newStartPage));
+    ReportIf(IsContinuous(GetDisplayMode()));
 
     int columns = ColumnsFromDisplayMode(GetDisplayMode());
     startPage = newStartPage;
@@ -879,7 +879,7 @@ void DisplayModel::ChangeStartPage(int newStartPage) {
    parts of each page is visible on the screen.
    Needs to be recalucated after scrolling the view. */
 void DisplayModel::RecalcVisibleParts() const {
-    CrashIf(!pagesInfo);
+    ReportIf(!pagesInfo);
     if (!pagesInfo) {
         return;
     }
@@ -887,7 +887,7 @@ void DisplayModel::RecalcVisibleParts() const {
     for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
         PageInfo* pageInfo = GetPageInfo(pageNo);
         if (!pageInfo->shown) {
-            CrashIf(0.0 != pageInfo->visibleRatio);
+            ReportIf(0.0 != pageInfo->visibleRatio);
             continue;
         }
 
@@ -896,7 +896,7 @@ void DisplayModel::RecalcVisibleParts() const {
 
         pageInfo->visibleRatio = 0.0;
         if (!visiblePart.IsEmpty()) {
-            CrashIf(pageRect.dx <= 0 || pageRect.dy <= 0);
+            ReportIf(pageRect.dx <= 0 || pageRect.dy <= 0);
             // calculate with floating point precision to prevent an integer overflow
             pageInfo->visibleRatio = 1.0f * visiblePart.dx * visiblePart.dy / ((float)pageRect.dx * pageRect.dy);
         }
@@ -913,7 +913,7 @@ int DisplayModel::GetPageNoByPoint(Point pt) const {
 
     for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
         PageInfo* pageInfo = GetPageInfo(pageNo);
-        CrashIf(!(0.0 == pageInfo->visibleRatio || pageInfo->shown));
+        ReportIf(!(0.0 == pageInfo->visibleRatio || pageInfo->shown));
         if (!pageInfo->shown) {
             continue;
         }
@@ -936,7 +936,7 @@ int DisplayModel::GetPageNextToPoint(Point pt) const {
 
     for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
         PageInfo* pageInfo = GetPageInfo(pageNo);
-        CrashIf(0.0 != pageInfo->visibleRatio && !pageInfo->shown);
+        ReportIf(0.0 != pageInfo->visibleRatio && !pageInfo->shown);
         if (!pageInfo->shown) {
             continue;
         }
@@ -1013,7 +1013,7 @@ PointF DisplayModel::CvtFromScreen(Point pt, int pageNo) {
     }
 
     const PageInfo* pageInfo = GetPageInfo(pageNo);
-    CrashIf(!pageInfo);
+    ReportIf(!pageInfo);
     if (!pageInfo) {
         return PointF();
     }
@@ -1094,7 +1094,7 @@ void DisplayModel::RenderVisibleParts() {
     for (int pageNo = 1; pageNo <= PageCount(); ++pageNo) {
         PageInfo* pageInfo = GetPageInfo(pageNo);
         if (pageInfo->visibleRatio > 0.0) {
-            CrashIf(!pageInfo->shown);
+            ReportIf(!pageInfo->shown);
             if (0 == firstVisiblePage) {
                 firstVisiblePage = pageNo;
             }
@@ -1416,7 +1416,7 @@ bool DisplayModel::GoToFirstPage() {
             return false;
         }
     } else {
-        CrashIf(!PageShown(startPage));
+        ReportIf(!PageShown(startPage));
         if (1 == startPage) {
             /* we're on a first page already */
             return false;
@@ -1471,7 +1471,7 @@ void DisplayModel::ScrollYBy(int dy, bool changePage) {
     int newPageNo;
     int currPageNo;
 
-    CrashIf(0 == dy);
+    ReportIf(0 == dy);
     if (0 == dy) {
         return;
     }
@@ -1482,7 +1482,7 @@ void DisplayModel::ScrollYBy(int dy, bool changePage) {
         if ((dy < 0) && (0 == currYOff)) {
             if (startPage > 1) {
                 newPageNo = startPage - 1;
-                CrashIf(!ValidPageNo(newPageNo));
+                ReportIf(!ValidPageNo(newPageNo));
                 pageInfo = GetPageInfo(newPageNo);
                 newYOff = pageInfo->pos.dy - viewPort.dy;
                 if (newYOff < 0) {
@@ -1603,12 +1603,12 @@ float DisplayModel::GetNextZoomStep(float towardsLevel) const {
         100, 125, 150, 200, 300, 400, 600, 800, 1000 /* added */,
         1200, 1600, 2000 /* added */, 2400, 3200, 4800 /* added */, 6400
     };
-    CrashIf(zoomLevels[0] != kZoomMin || zoomLevels[dimof(zoomLevels)-1] != kZoomMax);
+    ReportIf(zoomLevels[0] != kZoomMin || zoomLevels[dimof(zoomLevels)-1] != kZoomMax);
 #endif
     Vec<float>* zoomLevels = gGlobalPrefs->zoomLevels;
     int nZooms = zoomLevels->Size();
-    CrashIf(nZooms != 0 && (zoomLevels->at(0) < kZoomMin || zoomLevels->Last() > kZoomMax));
-    CrashIf(nZooms != 0 && zoomLevels->at(0) > zoomLevels->Last());
+    ReportIf(nZooms != 0 && (zoomLevels->at(0) < kZoomMin || zoomLevels->Last() > kZoomMax));
+    ReportIf(nZooms != 0 && zoomLevels->at(0) > zoomLevels->Last());
 
     float currZoom = GetZoomVirtual(true);
     if (currZoom == towardsLevel) {
@@ -1623,8 +1623,8 @@ float DisplayModel::GetNextZoomStep(float towardsLevel) const {
             widthZoom = std::min(widthZoom, pageWidthZoom);
         }
     }
-    CrashIf(pageZoom == (float)HUGE_VAL || widthZoom == (float)HUGE_VAL);
-    CrashIf(pageZoom > widthZoom);
+    ReportIf(pageZoom == (float)HUGE_VAL || widthZoom == (float)HUGE_VAL);
+    ReportIf(pageZoom > widthZoom);
     pageZoom *= 100 / dpiFactor;
     widthZoom *= 100 / dpiFactor;
 
@@ -1665,7 +1665,7 @@ float DisplayModel::GetNextZoomStep(float towardsLevel) const {
 
 void DisplayModel::RotateBy(int newRotation) {
     newRotation = NormalizeRotation(newRotation);
-    CrashIf(0 == newRotation);
+    ReportIf(0 == newRotation);
     if (0 == newRotation) {
         return;
     }
@@ -1763,7 +1763,7 @@ ScrollState DisplayModel::GetScrollState() {
     ScrollState state(FirstVisiblePageNo(), -1, -1);
     if (!ValidPageNo(state.page)) {
         state.page = CurrentPageNo();
-        CrashIf(!ValidPageNo(state.page));
+        ReportIf(!ValidPageNo(state.page));
     }
 
     PageInfo* pageInfo = GetPageInfo(state.page);
@@ -1857,7 +1857,7 @@ void DisplayModel::AddNavPoint() {
     }
     // make sure that the history doesn't grow overly large
     if (navHistoryIdx >= MAX_NAV_HISTORY_LEN) {
-        CrashIf(navHistoryIdx > MAX_NAV_HISTORY_LEN);
+        ReportIf(navHistoryIdx > MAX_NAV_HISTORY_LEN);
         navHistory.RemoveAt(0, navHistoryIdx - MAX_NAV_HISTORY_LEN + 1);
         navHistoryIdx = MAX_NAV_HISTORY_LEN - 1;
     }
@@ -1867,7 +1867,7 @@ void DisplayModel::AddNavPoint() {
 }
 
 bool DisplayModel::CanNavigate(int dir) const {
-    CrashIf(navHistoryIdx > navHistory.size());
+    ReportIf(navHistoryIdx > navHistory.size());
     if (dir < 0) {
         return navHistoryIdx >= (size_t)-dir;
     }
@@ -1911,7 +1911,7 @@ bool DisplayModel::ShouldCacheRendering(int pageNo) const {
 
 #if 0
 void DisplayModel::ScrollToLink(IPageDestination* dest) {
-    CrashIf(!dest || dest->GetPageNo() <= 0);
+    ReportIf(!dest || dest->GetPageNo() <= 0);
     if (!dest) {
         return;
     }
diff --git a/src/DocController.h b/src/DocController.h
index 02a76109bc4..ac8ec15f80c 100644
--- a/src/DocController.h
+++ b/src/DocController.h
@@ -53,7 +53,7 @@ struct DocController {
     DocControllerCallback* cb;
 
     explicit DocController(DocControllerCallback* cb) : cb(cb) {
-        CrashIf(!cb);
+        ReportIf(!cb);
     }
     virtual ~DocController() = default;
 
diff --git a/src/DocProperties.cpp b/src/DocProperties.cpp
index ec096e4f57a..b0ab25d907d 100644
--- a/src/DocProperties.cpp
+++ b/src/DocProperties.cpp
@@ -38,7 +38,7 @@ extern const char* gAllProps[] = {
 
 int PropsCount(const Props& props) {
     int n = props.Size();
-    CrashIf(n < 0 || (n % 2) != 0);
+    ReportIf(n < 0 || (n % 2) != 0);
     return n / 2;
 }
 
@@ -64,7 +64,7 @@ char* GetPropValueTemp(const Props& props, const char* name) {
 }
 
 void AddProp(Props& props, const char* name, const char* val, bool replaceIfExists) {
-    CrashIf(!name || !val);
+    ReportIf(!name || !val);
     int idx = GetPropIdx(props, name);
     if (idx < 0) {
         // doesn't exsit
diff --git a/src/EbookDoc.cpp b/src/EbookDoc.cpp
index 9a6b508d5d6..3eba7d039fe 100644
--- a/src/EbookDoc.cpp
+++ b/src/EbookDoc.cpp
@@ -111,7 +111,7 @@ static TempStr DecodeTextToUtf8Temp(const char* s, bool isXML = false) {
 }
 
 char* NormalizeURL(const char* url, const char* base) {
-    CrashIf(!url || !base);
+    ReportIf(!url || !base);
     if (*url == '/' || str::FindChar(url, ':')) {
         return str::Dup(url);
     }
@@ -523,7 +523,7 @@ ByteSlice* EpubDoc::GetImageData(const char* fileName, const char* pagePath) {
     ScopedCritSec scope(&zipAccess);
 
     if (!pagePath) {
-        CrashIf(true);
+        ReportIf(true);
         // if we're reparsing, we might not have pagePath, which is needed to
         // build the exact url so try to find a partial match
         // TODO: the correct approach would be to extend reparseIdx into a
@@ -577,7 +577,7 @@ ByteSlice* EpubDoc::GetImageData(const char* fileName, const char* pagePath) {
 
 ByteSlice EpubDoc::GetFileData(const char* relPath, const char* pagePath) {
     if (!pagePath) {
-        CrashIf(true);
+        ReportIf(true);
         return {};
     }
 
@@ -836,7 +836,7 @@ static ByteSlice loadFromStream(Fb2Doc* doc) {
 }
 
 bool Fb2Doc::Load() {
-    CrashIf(!stream && !fileName);
+    ReportIf(!stream && !fileName);
 
     ByteSlice data;
     if (fileName) {
@@ -1382,7 +1382,7 @@ TxtDoc::TxtDoc(const char* fileName) {
 #define TCR_HEADER "!!8-Bit!!"
 
 static char* DecompressTcrText(const char* data, size_t dataLen) {
-    CrashIf(!str::StartsWith(data, TCR_HEADER));
+    ReportIf(!str::StartsWith(data, TCR_HEADER));
     const char* curr = data + str::Len(TCR_HEADER);
     const char* end = data + dataLen;
 
@@ -1471,7 +1471,7 @@ static const char* TextFindEmailEnd(str::Str& htmlData, const char* curr) {
         }
         beforeAt.SetCopy(&htmlData.at(idx));
     } else {
-        CrashIf(!str::StartsWith(curr, "mailto:"));
+        ReportIf(!str::StartsWith(curr, "mailto:"));
         end = curr = curr + 7; // skip mailto:
         if (!IsEmailUsernameChar(*end)) {
             return nullptr;
diff --git a/src/EbookFormatter.cpp b/src/EbookFormatter.cpp
index b524fda4d28..30104315e44 100644
--- a/src/EbookFormatter.cpp
+++ b/src/EbookFormatter.cpp
@@ -113,7 +113,7 @@ void MobiFormatter::HandleTagImg(HtmlToken* t) {
 }
 
 void MobiFormatter::HandleHtmlTag(HtmlToken* t) {
-    CrashIf(!t->IsTag());
+    ReportIf(!t->IsTag());
 
     if (Tag_P == t->tag || Tag_Blockquote == t->tag) {
         HtmlFormatter::HandleHtmlTag(t);
@@ -139,7 +139,7 @@ void MobiFormatter::HandleHtmlTag(HtmlToken* t) {
 /* EPUB-specific formatting methods */
 
 void EpubFormatter::HandleTagImg(HtmlToken* t) {
-    CrashIf(!epubDoc);
+    ReportIf(!epubDoc);
     if (t->IsEndTag()) {
         return;
     }
@@ -171,7 +171,7 @@ void EpubFormatter::HandleTagPagebreak(HtmlToken* t) {
 }
 
 void EpubFormatter::HandleTagLink(HtmlToken* t) {
-    CrashIf(!epubDoc);
+    ReportIf(!epubDoc);
     if (t->IsEndTag()) {
         return;
     }
@@ -198,7 +198,7 @@ void EpubFormatter::HandleTagLink(HtmlToken* t) {
 }
 
 void EpubFormatter::HandleTagSvgImage(HtmlToken* t) {
-    CrashIf(!epubDoc);
+    ReportIf(!epubDoc);
     if (t->IsEndTag()) {
         return;
     }
@@ -218,7 +218,7 @@ void EpubFormatter::HandleTagSvgImage(HtmlToken* t) {
 }
 
 void EpubFormatter::HandleHtmlTag(HtmlToken* t) {
-    CrashIf(!t->IsTag());
+    ReportIf(!t->IsTag());
     if (hiddenDepth && t->IsEndTag() && tagNesting.size() == hiddenDepth && t->tag == tagNesting.Last()) {
         hiddenDepth = 0;
         UpdateTagNesting(t);
@@ -264,7 +264,7 @@ Fb2Formatter::Fb2Formatter(HtmlFormatterArgs* args, Fb2Doc* doc)
 }
 
 void Fb2Formatter::HandleTagImg(HtmlToken* t) {
-    CrashIf(!fb2Doc);
+    ReportIf(!fb2Doc);
     if (t->IsEndTag()) {
         return;
     }
@@ -338,7 +338,7 @@ void Fb2Formatter::HandleHtmlTag(HtmlToken* t) {
 /* standalone HTML-specific formatting methods */
 
 void HtmlFileFormatter::HandleTagImg(HtmlToken* t) {
-    CrashIf(!htmlDoc);
+    ReportIf(!htmlDoc);
     if (t->IsEndTag()) {
         return;
     }
@@ -356,7 +356,7 @@ void HtmlFileFormatter::HandleTagImg(HtmlToken* t) {
 }
 
 void HtmlFileFormatter::HandleTagLink(HtmlToken* t) {
-    CrashIf(!htmlDoc);
+    ReportIf(!htmlDoc);
     if (t->IsEndTag()) {
         return;
     }
diff --git a/src/EditAnnotations.cpp b/src/EditAnnotations.cpp
index f2ff933cd24..0d00703a3f8 100644
--- a/src/EditAnnotations.cpp
+++ b/src/EditAnnotations.cpp
@@ -220,11 +220,11 @@ void DeleteAnnotationAndUpdateUI(WindowTab* tab, Annotation* annot) {
 static void DeleteSelectedAnnotation(EditAnnotationsWindow* ew) {
     int idx = ew->listBox->GetCurrentSelection();
     if (idx < 0) {
-        CrashIf(ew->tab->selectedAnnotation != nullptr);
+        ReportIf(ew->tab->selectedAnnotation != nullptr);
         return;
     }
     Annotation* annot = ew->annotations.at(idx);
-    CrashIf(ew->tab->selectedAnnotation != annot);
+    ReportIf(ew->tab->selectedAnnotation != annot);
     DeleteAnnotationAndUpdateUI(ew->tab, annot);
 
     // Note: auto-selecting next annotation might cause page jumping
@@ -461,7 +461,7 @@ static PdfColor GetDropDownColor(const char* sv) {
     int idx = seqstrings::StrToIdx(gColors, sv);
     if (idx >= 0) {
         int nMaxColors = (int)dimof(gColorsValues);
-        CrashIf(idx >= nMaxColors);
+        ReportIf(idx >= nMaxColors);
         if (idx < nMaxColors) {
             return gColorsValues[idx];
         }
@@ -813,7 +813,7 @@ static void UpdateUIForSelectedAnnotation(EditAnnotationsWindow* ew, Annotation*
     HidePerAnnotControls(ew);
     if (annot) {
         int itemNo = ew->annotations.Find(annot);
-        CrashIf(itemNo < 0);
+        ReportIf(itemNo < 0);
 
         DoRect(ew, annot);
         DoAuthor(ew, annot);
@@ -870,7 +870,7 @@ static void UpdateUIForSelectedAnnotation(EditAnnotationsWindow* ew, Annotation*
         // see https://github.com/sumatrapdfreader/sumatrapdf/issues/1701
         logf("UpdateUIForSelectedAnnotation: invalid annotPageNo (%d), should be <= than nPages (%d)\n", annotPageNo,
              nPages);
-        CrashIf(annotPageNo > nPages);
+        ReportIf(annotPageNo > nPages);
         return;
     }
 
@@ -887,13 +887,13 @@ static void UpdateUIForSelectedAnnotation(EditAnnotationsWindow* ew, Annotation*
 }
 
 static void ButtonSaveAttachment(EditAnnotationsWindow* ew) {
-    CrashIf(!ew->tab->selectedAnnotation);
+    ReportIf(!ew->tab->selectedAnnotation);
     // TODO: implement me
     MessageBoxNYI(ew->hwnd);
 }
 
 static void ButtonEmbedAttachment(EditAnnotationsWindow* ew) {
-    CrashIf(!ew->tab->selectedAnnotation);
+    ReportIf(!ew->tab->selectedAnnotation);
     // TODO: implement me
     MessageBoxNYI(ew->hwnd);
 }
@@ -932,7 +932,7 @@ void UpdateAnnotationsList(EditAnnotationsWindow* ew) {
 }
 
 static void ButtonDeleteHandler(EditAnnotationsWindow* ew) {
-    CrashIf(!ew->tab->selectedAnnotation);
+    ReportIf(!ew->tab->selectedAnnotation);
     DeleteSelectedAnnotation(ew);
 }
 
@@ -1003,7 +1003,7 @@ static Static* CreateStatic(HWND parent, const char* s = nullptr) {
     args.text = s;
     args.font = GetAppFont();
     HWND hwnd = w->Create(args);
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     return w;
 }
 
@@ -1070,7 +1070,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
         args.font = fnt;
         auto w = new Edit();
         HWND hwnd = w->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
         w->maxDx = 150;
         w->onTextChanged = [ew]() { return ContentsChanged(ew); };
         ew->editContents = w;
@@ -1323,7 +1323,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
         auto w = new Button();
         w->SetInsetsPt(8, 0, 0, 0);
         HWND hwnd = w->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
 
         w->onClicked = [ew] { return ButtonSaveAttachment(ew); };
         ew->buttonSaveAttachment = w;
@@ -1339,7 +1339,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
         auto w = new Button();
         w->SetInsetsPt(8, 0, 0, 0);
         HWND hwnd = w->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
 
         w->onClicked = [ew] { return ButtonEmbedAttachment(ew); };
         ew->buttonEmbedAttachment = w;
@@ -1355,7 +1355,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
         auto w = new Button();
         w->SetInsetsPt(11, 0, 0, 0);
         HWND hwnd = w->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
 
         // TODO: doesn't work
         // w->SetTextColor(MkColor(0xff, 0, 0));
@@ -1380,7 +1380,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
 
         auto w = new Button();
         HWND hwnd = w->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
 
         w->SetIsEnabled(false); // only enabled if there are changes
         w->onClicked = [ew] { return ButtonSaveToCurrentPDFHandler(ew); };
@@ -1398,7 +1398,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
         auto w = new Button();
         w->SetInsetsPt(8, 0, 0, 0);
         HWND hwnd = w->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
 
         w->SetIsEnabled(false); // only enabled if there are changes
         w->onClicked = [ew] { return ButtonSaveToNewFileHandler(ew); };
@@ -1412,7 +1412,7 @@ static void CreateMainLayout(EditAnnotationsWindow* ew) {
 }
 
 void ShowEditAnnotationsWindow(WindowTab* tab) {
-    CrashIf(!tab->AsFixed()->GetEngine());
+    ReportIf(!tab->AsFixed()->GetEngine());
     EditAnnotationsWindow* ew = tab->editAnnotsWindow;
     if (ew) {
         HwndMakeVisible(ew->hwnd);
diff --git a/src/EngineBase.cpp b/src/EngineBase.cpp
index 1b4a62229ff..b08406a1fd2 100644
--- a/src/EngineBase.cpp
+++ b/src/EngineBase.cpp
@@ -248,13 +248,13 @@ bool TocTree::IsChecked(TreeItem ti) {
 }
 
 void TocTree::SetHandle(TreeItem ti, HTREEITEM hItem) {
-    CrashIf(ti < 0);
+    ReportIf(ti < 0);
     TocItem* tocItem = (TocItem*)ti;
     tocItem->hItem = hItem;
 }
 
 HTREEITEM TocTree::GetHandle(TreeItem ti) {
-    CrashIf(ti < 0);
+    ReportIf(ti < 0);
     TocItem* tocItem = (TocItem*)ti;
     return tocItem->hItem;
 }
@@ -332,7 +332,7 @@ EngineBase::~EngineBase() {
 }
 
 int EngineBase::PageCount() const {
-    CrashIf(pageCount < 0);
+    ReportIf(pageCount < 0);
     return pageCount;
 }
 
diff --git a/src/EngineBase.h b/src/EngineBase.h
index b064e125fc0..538d5d469de 100644
--- a/src/EngineBase.h
+++ b/src/EngineBase.h
@@ -120,7 +120,7 @@ struct PageDestinationURL : IPageDestination {
     PageDestinationURL() = delete;
 
     PageDestinationURL(const char* u) {
-        CrashIf(!u);
+        ReportIf(!u);
         kind = kindDestinationLaunchURL;
         url = str::Dup(u);
     }
@@ -141,7 +141,7 @@ struct PageDestinationFile : IPageDestination {
     PageDestinationFile() = delete;
 
     PageDestinationFile(const char* u, const char* dest) {
-        CrashIf(!u);
+        ReportIf(!u);
         kind = kindDestinationLaunchFile;
         path = str::Dup(u);
         dest = str::Dup(dest);
diff --git a/src/EngineCreate.cpp b/src/EngineCreate.cpp
index 2fcc0074f92..44daf0610c4 100644
--- a/src/EngineCreate.cpp
+++ b/src/EngineCreate.cpp
@@ -139,7 +139,7 @@ static EngineBase* CreateEngineForKind(Kind kind, const char* path, PasswordUI*
 }
 
 EngineBase* CreateEngineFromFile(const char* path, PasswordUI* pwdUI, bool enableChmEngine) {
-    CrashIf(!path);
+    ReportIf(!path);
 
     // try to open with the engine guess from file name
     // if that fails, try to guess the file type based on content
diff --git a/src/EngineDjVu.cpp b/src/EngineDjVu.cpp
index 47f3db5df6a..538b4029470 100644
--- a/src/EngineDjVu.cpp
+++ b/src/EngineDjVu.cpp
@@ -133,7 +133,7 @@ struct DjVuContext {
         ctx = ddjvu_context_create("DjVuEngine");
         // reset the locale to "C" as most other code expects
         setlocale(LC_ALL, "C");
-        CrashIf(!ctx);
+        ReportIf(!ctx);
     }
 
     int AddRef() {
@@ -146,7 +146,7 @@ struct DjVuContext {
 
     int Release() {
         EnterCriticalSection(&lock);
-        CrashIf(refCount <= 0);
+        ReportIf(refCount <= 0);
         --refCount;
         LeaveCriticalSection(&lock);
         return refCount;
@@ -212,7 +212,7 @@ static DjVuContext* GetDjVuContext() {
 }
 
 static void ReleaseDjVuContext() {
-    CrashIf(!gDjVuContext);
+    ReportIf(!gDjVuContext);
     int refCount = gDjVuContext->Release();
     if (refCount != 0) {
         return;
@@ -221,7 +221,7 @@ static void ReleaseDjVuContext() {
 
 void CleanupEngineDjVu() {
     if (gDjVuContext) {
-        CrashIf(gDjVuContext->refCount != 0);
+        ReportIf(gDjVuContext->refCount != 0);
         delete gDjVuContext;
         gDjVuContext = nullptr;
     }
@@ -338,7 +338,7 @@ EngineBase* EngineDjVu::Clone() {
 }
 
 RectF EngineDjVu::PageMediabox(int pageNo) {
-    CrashIf(pageNo < 1 || pageNo > pageCount);
+    ReportIf(pageNo < 1 || pageNo > pageCount);
     DjVuPageInfo* pi = pages[pageNo - 1];
     return pi->mediabox;
 }
@@ -421,7 +421,7 @@ bool EngineDjVu::LoadMediaboxes() {
             }
             DjVuInfoChunk info;
             bool ok = r.UnpackBE(&info, sizeof(info), "2w6b", 4);
-            CrashIf(!ok);
+            ReportIf(!ok);
             int dpi = MAKEWORD(info.dpiLo, info.dpiHi); // dpi is little-endian
             // DjVuLibre ignores DPI values outside 25 to 6000 in DjVuInfo::decode
             if (dpi < 25 || 6000 < dpi) {
@@ -598,7 +598,7 @@ RenderedBitmap* EngineDjVu::RenderPage(RenderPageArgs& args) {
             rot = DDJVU_ROTATE_90;
             break;
         default:
-            CrashIf("invalid rotation");
+            ReportIf("invalid rotation");
             break;
     }
     ddjvu_page_set_rotation(page, rot);
@@ -721,7 +721,7 @@ RectF EngineDjVu::PageContentBox(int pageNo, RenderTarget) {
 }
 
 PointF EngineDjVu::TransformPoint(PointF pt, int pageNo, float zoom, int rotation, bool inverse) {
-    CrashIf(zoom <= 0);
+    ReportIf(zoom <= 0);
     if (zoom <= 0) {
         return pt;
     }
@@ -875,7 +875,7 @@ PageText EngineDjVu::ExtractPageText(int pageNo) {
 
     PageText res;
 
-    CrashIf(str::Len(extracted.Get()) != coords.size());
+    ReportIf(str::Len(extracted.Get()) != coords.size());
     ddjvu_status_t status;
     ddjvu_pageinfo_t info;
     while ((status = ddjvu_document_get_pageinfo(doc, pageNo - 1, &info)) < DDJVU_JOB_OK) {
@@ -901,7 +901,7 @@ PageText EngineDjVu::ExtractPageText(int pageNo) {
             coords.at(i).y = page.dy - coords.at(i).y - coords.at(i).dy;
         }
     }
-    CrashIf(coords.size() != extracted.size());
+    ReportIf(coords.size() != extracted.size());
     res.len = (int)extracted.size();
     res.text = extracted.StealData();
     res.coords = coords.StealData();
@@ -909,7 +909,7 @@ PageText EngineDjVu::ExtractPageText(int pageNo) {
 }
 
 Vec<IPageElement*> EngineDjVu::GetElements(int pageNo) {
-    CrashIf(pageNo < 1 || pageNo > PageCount());
+    ReportIf(pageNo < 1 || pageNo > PageCount());
     auto pi = pages[pageNo - 1];
     if (pi->gotAllElements) {
         return pi->allElements;
diff --git a/src/EngineDump.cpp b/src/EngineDump.cpp
index 6d9f70eb036..32bb7e69b53 100644
--- a/src/EngineDump.cpp
+++ b/src/EngineDump.cpp
@@ -416,7 +416,7 @@ void DumpData(EngineBase* engine, bool fullDump) {
 #define ErrOut1(msg) fprintf(stderr, "%s", msg "\n")
 
 static bool CheckRenderPath(const char* path) {
-    CrashIf(!path);
+    ReportIf(!path);
     bool hasArg = false;
     const char* p = path - 1;
     while ((p = str::FindChar(p + 1, '%')) != nullptr) {
diff --git a/src/EngineEbook.cpp b/src/EngineEbook.cpp
index 68164eb3167..04a6b86936b 100644
--- a/src/EngineEbook.cpp
+++ b/src/EngineEbook.cpp
@@ -258,7 +258,7 @@ void EngineEbook::GetTransform(Matrix& m, float zoom, int rotation) {
 }
 
 Vec<DrawInstr>* EngineEbook::GetHtmlPage(int pageNo) {
-    CrashIf(pageNo < 1 || PageCount() < pageNo);
+    ReportIf(pageNo < 1 || PageCount() < pageNo);
     if (pageNo < 1 || PageCount() < pageNo) {
         return nullptr;
     }
@@ -266,7 +266,7 @@ Vec<DrawInstr>* EngineEbook::GetHtmlPage(int pageNo) {
 }
 
 HtmlPage* EngineEbook::GetHtmlPage2(int pageNo) {
-    CrashIf(pageNo < 1 || PageCount() < pageNo);
+    ReportIf(pageNo < 1 || PageCount() < pageNo);
     if (pageNo < 1 || PageCount() < pageNo) {
         return nullptr;
     }
@@ -296,7 +296,7 @@ bool EngineEbook::ExtractPageAnchors() {
         baseAnchors.Append(baseAnchor);
     }
 
-    CrashIf(baseAnchors.size() != pages->size());
+    ReportIf(baseAnchors.size() != pages->size());
     return true;
 }
 
@@ -394,7 +394,7 @@ PageText EngineEbook::ExtractPageText(int pageNo) {
                     (bbox.x < coords.Last().BR().x || bbox.y > coords.Last().y + coords.Last().dy * 0.8)) {
                     content.Append(lineSep);
                     coords.AppendBlanks(str::Len(lineSep));
-                    CrashIf(*lineSep && !coords.Last().IsEmpty());
+                    ReportIf(*lineSep && !coords.Last().IsEmpty());
                 } else if (insertSpace && coords.size() > 0) {
                     int swidth = bbox.x - coords.Last().BR().x;
                     if (swidth > 0) {
@@ -418,7 +418,7 @@ PageText EngineEbook::ExtractPageText(int pageNo) {
                     (bbox.BR().x > coords.Last().x || bbox.y > coords.Last().y + coords.Last().dy * 0.8)) {
                     content.Append(lineSep);
                     coords.AppendBlanks(str::Len(lineSep));
-                    CrashIf(*lineSep && !coords.Last().IsEmpty());
+                    ReportIf(*lineSep && !coords.Last().IsEmpty());
                 } else if (insertSpace && coords.size() > 0) {
                     int swidth = coords.Last().x - bbox.BR().x;
                     if (swidth > 0) {
@@ -447,7 +447,7 @@ PageText EngineEbook::ExtractPageText(int pageNo) {
         content.Append(lineSep);
         coords.AppendBlanks(str::Len(lineSep));
     }
-    CrashIf(coords.size() != content.size());
+    ReportIf(coords.size() != content.size());
 
     PageText res;
     res.len = (int)content.size();
@@ -517,13 +517,13 @@ static RenderedBitmap* getImageFromData(const ByteSlice& imageData) {
 }
 
 RenderedBitmap* EngineEbook::GetImageForPageElement(IPageElement* iel) {
-    CrashIf(iel->GetKind() != kindPageElementImage);
+    ReportIf(iel->GetKind() != kindPageElementImage);
     PageElementImage* el = (PageElementImage*)iel;
     int pageNo = el->pageNo;
     int idx = el->imageID;
     Vec<DrawInstr>* pageInstrs = GetHtmlPage(pageNo);
     auto&& i = pageInstrs->at(idx);
-    CrashIf(i.type != DrawInstrType::Image);
+    ReportIf(i.type != DrawInstrType::Image);
     return getImageFromData(i.GetImage());
 }
 
@@ -611,7 +611,7 @@ TempStr EngineEbook::ExtractFontListTemp() {
             FontFamily family;
             if (!i.font->font) {
                 // TODO: handle gdi
-                CrashIf(!i.font->GetHFont());
+                ReportIf(!i.font->GetHFont());
                 continue;
             }
             Status ok = i.font->font->GetFamily(&family);
@@ -1083,7 +1083,7 @@ IPageDestination* EngineMobi::GetNamedDest(const char* name) {
             break;
         }
     }
-    CrashIf(pageNo < 1 || pageNo > PageCount());
+    ReportIf(pageNo < 1 || pageNo > PageCount());
 
     ByteSlice htmlData = doc->GetHtmlData();
     size_t htmlLen = htmlData.size();
@@ -1312,7 +1312,7 @@ class ChmFormatter : public HtmlFormatter {
 };
 
 void ChmFormatter::HandleTagImg(HtmlToken* t) {
-    CrashIf(!chmDoc);
+    ReportIf(!chmDoc);
     if (t->IsEndTag()) {
         return;
     }
@@ -1344,7 +1344,7 @@ void ChmFormatter::HandleTagPagebreak(HtmlToken* t) {
 }
 
 void ChmFormatter::HandleTagLink(HtmlToken* t) {
-    CrashIf(!chmDoc);
+    ReportIf(!chmDoc);
     if (t->IsEndTag()) {
         return;
     }
diff --git a/src/EngineImages.cpp b/src/EngineImages.cpp
index 5d193fa4426..29f7efb2476 100644
--- a/src/EngineImages.cpp
+++ b/src/EngineImages.cpp
@@ -135,7 +135,7 @@ EngineImages::~EngineImages() {
     EnterCriticalSection(&cacheAccess);
     while (pageCache.size() > 0) {
         ImagePage* lastPage = pageCache.Last();
-        CrashIf(lastPage->refs != 1);
+        ReportIf(lastPage->refs != 1);
         DropPage(lastPage, true);
     }
     DeleteVecMembers(pages);
@@ -144,7 +144,7 @@ EngineImages::~EngineImages() {
 }
 
 RectF EngineImages::PageMediabox(int pageNo) {
-    CrashIf((pageNo < 1) || (pageNo > pageCount));
+    ReportIf((pageNo < 1) || (pageNo > pageCount));
     int n = pageNo - 1;
     ImagePageInfo* pi = pages[n];
     RectF& mbox = pi->mediabox;
@@ -248,7 +248,7 @@ static IPageElement* NewImageElement(int pageNo, float dx, float dy) {
 
 // don't delete the result
 Vec<IPageElement*> EngineImages::GetElements(int pageNo) {
-    CrashIf(pageNo < 1 || pageNo > pageCount);
+    ReportIf(pageNo < 1 || pageNo > pageCount);
     auto* pi = pages[pageNo - 1];
     if (pi->allElements.size() > 0) {
         return pi->allElements;
@@ -276,7 +276,7 @@ IPageElement* EngineImages::GetElementAtPos(int pageNo, PointF pt) {
 }
 
 RenderedBitmap* EngineImages::GetImageForPageElement(IPageElement* pel) {
-    CrashIf(pel->GetKind() != kindPageElementImage);
+    ReportIf(pel->GetKind() != kindPageElementImage);
     auto ipel = (PageElementImage*)pel;
     int pageNo = ipel->pageNo;
     auto page = GetPage(pageNo);
@@ -334,7 +334,7 @@ ImagePage* EngineImages::GetPage(int pageNo, bool tryOnly) {
     if (!result) {
         // TODO: drop most memory intensive pages first
         if (pageCache.size() >= MAX_IMAGE_PAGE_CACHE) {
-            CrashIf(pageCache.size() != MAX_IMAGE_PAGE_CACHE);
+            ReportIf(pageCache.size() != MAX_IMAGE_PAGE_CACHE);
             DropPage(pageCache.Last(), true);
         }
         result = new ImagePage(pageNo, nullptr);
@@ -360,7 +360,7 @@ ImagePage* EngineImages::GetPage(int pageNo, bool tryOnly) {
 void EngineImages::DropPage(ImagePage* page, bool forceRemove) {
     ScopedCritSec scope(&cacheAccess);
     page->refs--;
-    CrashIf(page->refs < 0);
+    ReportIf(page->refs < 0);
 
     if (0 == page->refs || forceRemove) {
         pageCache.Remove(page);
@@ -417,7 +417,7 @@ RectF EngineImages::PageContentBox(int pageNo, RenderTarget target) {
     }
 
     auto getPixel = [&bmpData, bytesPerPixel](int x, int y) -> uint32_t {
-        CrashIf(x < 0 || x >= (int)bmpData.Width || y < 0 || y >= (int)bmpData.Height);
+        ReportIf(x < 0 || x >= (int)bmpData.Width || y < 0 || y >= (int)bmpData.Height);
         auto data = static_cast<const uint8_t*>(bmpData.Scan0);
         unsigned idx = bytesPerPixel * x + bmpData.Stride * y;
         uint32_t rgb = (data[idx + 2] << 16) | (data[idx + 1] << 8) | data[idx];
@@ -618,7 +618,7 @@ bool EngineImage::FinishLoading() {
     auto pi = new ImagePageInfo();
     pi->mediabox = RectF(0, 0, (float)image->GetWidth(), (float)image->GetHeight());
     pages.Append(pi);
-    CrashIf(pages.size() != 1);
+    ReportIf(pages.size() != 1);
 
     // extract all frames from multi-page TIFFs and animated GIFs
     // TODO: do the same for .avif and .heic formats
@@ -700,7 +700,7 @@ Bitmap* EngineImage::LoadBitmapForPage(int pageNo, bool& deleteAfterUse) {
     ReportIfNotMultiImage(this);
     const GUID* dim = imageFormat == kindFileTiff ? &FrameDimensionPage : &FrameDimensionTime;
     uint frameCount = image->GetFrameCount(dim);
-    CrashIf((unsigned int)pageNo > frameCount);
+    ReportIf((unsigned int)pageNo > frameCount);
     Bitmap* frame = image->Clone(0, 0, image->GetWidth(), image->GetHeight(), PixelFormat32bppARGB);
     if (!frame) {
         return nullptr;
@@ -965,7 +965,7 @@ RectF EngineImageDir::LoadMediabox(int pageNo) {
 }
 
 EngineBase* EngineImageDir::CreateFromFile(const char* fileName) {
-    CrashIf(!dir::Exists(fileName));
+    ReportIf(!dir::Exists(fileName));
     EngineImageDir* engine = new EngineImageDir();
     if (!LoadImageDir(engine, fileName)) {
         engine->Release();
@@ -1183,12 +1183,12 @@ static const char* GetExtFromArchiveType(MultiFormatArchive* cbxFile) {
         case MultiFormatArchive::Format::Tar:
             return ".cbt";
     }
-    CrashIf(true);
+    ReportIf(true);
     return nullptr;
 }
 
 bool EngineCbx::FinishLoading() {
-    CrashIf(!cbxFile);
+    ReportIf(!cbxFile);
     if (!cbxFile) {
         return false;
     }
@@ -1286,7 +1286,7 @@ TocTree* EngineCbx::GetToc() {
 }
 
 ByteSlice EngineCbx::GetImageData(int pageNo) {
-    CrashIf((pageNo < 1) || (pageNo > PageCount()));
+    ReportIf((pageNo < 1) || (pageNo > PageCount()));
     size_t fileId = files[pageNo - 1]->fileId;
     ByteSlice d = cbxFile->GetFileDataById(fileId);
     return d;
diff --git a/src/EngineMulti.cpp b/src/EngineMulti.cpp
index 874fa3063ba..382e8995862 100644
--- a/src/EngineMulti.cpp
+++ b/src/EngineMulti.cpp
@@ -99,7 +99,7 @@ EngineMulti::~EngineMulti() {
 
 EngineBase* EngineMulti::Clone() {
     // TODO: support CreateFromFiles()
-    CrashIf(true);
+    ReportIf(true);
     return nullptr;
 }
 
@@ -162,7 +162,7 @@ IPageElement* EngineMulti::GetElementAtPos(int pageNo, PointF pt) {
 }
 
 RenderedBitmap* EngineMulti::GetImageForPageElement(IPageElement* ipel) {
-    CrashIf(kindPageElementImage != ipel->GetKind());
+    ReportIf(kindPageElementImage != ipel->GetKind());
     PageElementImage* pel = (PageElementImage*)ipel;
     EngineBase* e = PageToEngine(pel->pageNo);
     return e->GetImageForPageElement(pel);
@@ -215,7 +215,7 @@ static void updateTocItemsPageNo(TocItem* ti, int nPageNoAdd, bool root) {
 }
 
 TocTree* EngineMulti::GetToc() {
-    CrashIf(!tocTree);
+    ReportIf(!tocTree);
     return tocTree;
 }
 
@@ -388,14 +388,14 @@ void EngineMulti::UpdatePagesForEngines(Vec<EngineInfo>& enginesInfo) {
         nTotalPages += nPages;
     }
     pageCount = nTotalPages;
-    CrashIf((size_t)pageCount != pageToEngine.size());
+    ReportIf((size_t)pageCount != pageToEngine.size());
 
     auto verifyPages = [&nTotalPages](TocItem* ti) -> bool {
         if (!IsPageNavigationDestination(ti->dest)) {
             return true;
         }
         int pageNo = ti->pageNo;
-        CrashIf(pageNo > nTotalPages);
+        ReportIf(pageNo > nTotalPages);
         return true;
     };
 
diff --git a/src/EngineMupdf.cpp b/src/EngineMupdf.cpp
index 5636a3bfe7d..c307602dd1c 100644
--- a/src/EngineMupdf.cpp
+++ b/src/EngineMupdf.cpp
@@ -186,8 +186,8 @@ static int FzGetPageNo(fz_context* ctx, fz_document* doc, fz_link* link, fz_outl
 
 static IPageDestination* NewPageDestinationMupdf(fz_context* ctx, fz_document* doc, fz_link* link,
                                                  fz_outline* outline) {
-    CrashIf(link && outline);
-    CrashIf(!link && !outline);
+    ReportIf(link && outline);
+    ReportIf(!link && !outline);
     char* uri = FzGetURL(link, outline);
 
     const char* maybePath = (const char*)uri;
@@ -265,7 +265,7 @@ static bool IsPointInRect(fz_rect rect, fz_point pt) {
 fz_matrix FzCreateViewCtm(fz_rect mediabox, float zoom, int rotation) {
     fz_matrix ctm = fz_pre_scale(fz_rotate((float)rotation), zoom, zoom);
 
-    CrashIf(0 != mediabox.x0 || 0 != mediabox.y0);
+    ReportIf(0 != mediabox.x0 || 0 != mediabox.y0);
     rotation = (rotation + 360) % 360;
     if (90 == rotation) {
         ctm = fz_pre_translate(ctm, 0, -mediabox.y1);
@@ -275,7 +275,7 @@ fz_matrix FzCreateViewCtm(fz_rect mediabox, float zoom, int rotation) {
         ctm = fz_pre_translate(ctm, -mediabox.x1, 0);
     }
 
-    CrashIf(fz_matrix_expansion(ctm) <= 0);
+    ReportIf(fz_matrix_expansion(ctm) <= 0);
     if (fz_matrix_expansion(ctm) == 0) {
         return fz_identity;
     }
@@ -285,7 +285,7 @@ fz_matrix FzCreateViewCtm(fz_rect mediabox, float zoom, int rotation) {
 
 // TODO: maybe make dpi a float as well
 static float DpiScale(float x, int dpi) {
-    CrashIf(dpi < 70.f);
+    ReportIf(dpi < 70.f);
     // TODO: maybe implement step scaling like mupdf
     float res = x * (float)dpi;
     res = res / 96.f;
@@ -477,10 +477,10 @@ static void FzStreamFingerprint(fz_context* ctx, fz_stream* stm, u8 digest[16])
         fz_report_error(ctx);
         return;
     }
-    CrashIf(nullptr == buf);
+    ReportIf(nullptr == buf);
     u8* data;
     size_t size = fz_buffer_extract(ctx, buf, &data);
-    CrashIf((size_t)fileLen != size);
+    ReportIf((size_t)fileLen != size);
     fz_drop_buffer(ctx, buf);
 
     fz_md5 md5;
@@ -498,7 +498,7 @@ static ByteSlice FzExtractStreamData(fz_context* ctx, fz_stream* stream) {
 
     u8* data = nullptr;
     size_t size = fz_buffer_extract(ctx, buf, &data);
-    CrashIf((size_t)fileLen != size);
+    ReportIf((size_t)fileLen != size);
     fz_drop_buffer(ctx, buf);
     if (!data || size == 0) {
         return {};
@@ -598,7 +598,7 @@ static WCHAR* FzTextPageToStr(fz_stext_page* text, Rect** coordsOut) {
         block = block->next;
     }
 
-    CrashIf(content.size() != rects.size());
+    ReportIf(content.size() != rects.size());
 
     if (coordsOut) {
         *coordsOut = rects.StealData();
@@ -981,7 +981,7 @@ static bool RectFullyContains(RectF r1, RectF r2) {
 // if an elements fully obscures another, remove it from the list
 static bool RemoveHeWhoFullyContains(Vec<IPageElement*>& els) {
     int n = els.Size();
-    CrashIf(n < 2);
+    ReportIf(n < 2);
     for (int i = 0; i < n; i++) {
         RectF r1 = els[i]->GetRect();
         for (int j = 0; j < n; j++) {
@@ -1014,7 +1014,7 @@ static IPageElement* PickBestElement(Vec<IPageElement*>& els) {
     }
     bool didRemove = RemoveHeWhoFullyContains(els);
     if (didRemove) {
-        CrashIf(els.Size() != n - 1);
+        ReportIf(els.Size() != n - 1);
         goto Encore;
     }
     return els[0];
@@ -1225,8 +1225,8 @@ static fz_link* FixupPageLinks(fz_link* root) {
         if (link->rect.y0 > link->rect.y1) {
             std::swap(link->rect.y0, link->rect.y1);
         }
-        CrashIf(link->rect.x1 < link->rect.x0);
-        CrashIf(link->rect.y1 < link->rect.y0);
+        ReportIf(link->rect.x1 < link->rect.x0);
+        ReportIf(link->rect.y1 < link->rect.y0);
     }
     return new_root;
 }
@@ -1528,7 +1528,7 @@ static Vec<ContextThreadID>* gPerThreadContexts;
 static CRITICAL_SECTION gPerThreadContextsCs;
 
 void InitializeEngineMupdf() {
-    CrashIf(gPerThreadContexts);
+    ReportIf(gPerThreadContexts);
     InitializeCriticalSection(&gPerThreadContextsCs);
     gPerThreadContexts = new Vec<ContextThreadID>();
 }
@@ -1687,7 +1687,7 @@ const char* ParseEmbeddedStreamNumber(const char* path, int* streamNoOut) {
     if (streamNoStr) {
         char* rest = (char*)str::Parse(streamNoStr, ":%d", &streamNo);
         // there shouldn't be any left unparsed data
-        CrashIf(!rest);
+        ReportIf(!rest);
         if (!rest) {
             streamNo = -1;
         }
@@ -1806,7 +1806,7 @@ static ByteSlice PalmDocToHTML(const char* path) {
 bool EngineMupdf::Load(const char* path, PasswordUI* pwdUI) {
     const char* pathA = path;
     auto ctx = Ctx();
-    CrashIf(FilePath() || _doc || !ctx);
+    ReportIf(FilePath() || _doc || !ctx);
     SetFilePath(path);
 
     auto ext = path::GetExtTemp(path);
@@ -1928,7 +1928,7 @@ font-family: "Consolas";
 // TODO: need to do stuff to support .txt etc.
 bool EngineMupdf::Load(IStream* stream, const char* nameHint, PasswordUI* pwdUI) {
     auto ctx = Ctx();
-    CrashIf(FilePath() || _doc || !ctx);
+    ReportIf(FilePath() || _doc || !ctx);
     if (!ctx) {
         return false;
     }
@@ -2327,7 +2327,7 @@ bool EngineMupdf::FinishLoading() {
     }
 
     // TODO: support javascript
-    CrashIf(pdf_js_supported(ctx, pdfdoc));
+    ReportIf(pdf_js_supported(ctx, pdfdoc));
 
     return true;
 }
@@ -2394,7 +2394,7 @@ TocItem* EngineMupdf::BuildTocTree(TocItem* parent, fz_outline* outline, int& id
             root = item;
             curr = item;
         } else {
-            CrashIf(!curr);
+            ReportIf(!curr);
             if (curr) {
                 curr->next = item;
             }
@@ -2521,7 +2521,7 @@ IPageDestination* EngineMupdf::GetNamedDest(const char* name) {
 // return a page but only if is fully loaded
 FzPageInfo* EngineMupdf::GetFzPageInfoFast(int pageNo) {
     ScopedCritSec scope(&pagesAccess);
-    CrashIf(pageNo < 1 || pageNo > pageCount);
+    ReportIf(pageNo < 1 || pageNo > pageCount);
     FzPageInfo* pageInfo = pages[pageNo - 1];
     if (!pageInfo->page || !pageInfo->fullyLoaded) {
         return nullptr;
@@ -2701,7 +2701,7 @@ FzPageInfo* EngineMupdf::GetFzPageInfo(int pageNo, bool loadQuick, fz_cookie* co
     // TODO: minimize time spent under pagesAccess when fully loading
     ScopedCritSec scope(&pagesAccess);
 
-    CrashIf(pageNo < 1 || pageNo > pageCount);
+    ReportIf(pageNo < 1 || pageNo > pageCount);
     int pageIdx = pageNo - 1;
     FzPageInfo* pageInfo = pages[pageIdx];
 
@@ -2743,7 +2743,7 @@ FzPageInfo* EngineMupdf::GetFzPageInfo(int pageNo, bool loadQuick, fz_cookie* co
         return pageInfo;
     }
 
-    CrashIf(pageInfo->pageNo != pageNo);
+    ReportIf(pageInfo->pageNo != pageNo);
 
     pageInfo->fullyLoaded = true;
 
@@ -2981,9 +2981,9 @@ Vec<IPageElement*> EngineMupdf::GetElements(int pageNo) {
 }
 
 void HandleLinkMupdf(EngineMupdf* e, IPageDestination* dest, ILinkHandler* linkHandler) {
-    CrashIf(kindDestinationMupdf != dest->GetKind());
+    ReportIf(kindDestinationMupdf != dest->GetKind());
     PageDestinationMupdf* link = (PageDestinationMupdf*)dest;
-    CrashIf(!(link->outline || link->link));
+    ReportIf(!(link->outline || link->link));
     const char* uri = link->outline ? link->outline->uri : nullptr;
     if (!link->outline) {
         uri = link->link->uri;
@@ -3013,7 +3013,7 @@ void HandleLinkMupdf(EngineMupdf* e, IPageDestination* dest, ILinkHandler* linkH
     }
     if (pageNo < 0) {
         // TODO: more?
-        // CrashIf(true);
+        // ReportIf(true);
         return;
     }
 
@@ -3041,7 +3041,7 @@ bool EngineMupdf::HandleLink(IPageDestination* dest, ILinkHandler* linkHandler)
 }
 
 RenderedBitmap* EngineMupdf::GetImageForPageElement(IPageElement* ipel) {
-    CrashIf(kindPageElementImage != ipel->GetKind());
+    ReportIf(kindPageElementImage != ipel->GetKind());
     auto pel = (PageElementImage*)ipel;
     auto r = pel->rect;
     int pageNo = pel->pageNo;
@@ -3087,8 +3087,8 @@ RenderedBitmap* EngineMupdf::GetPageImage(int pageNo, RectF rect, int imageIdx)
     bool outOfBounds = imageIdx >= images.Size();
     fz_rect imgRect = images.at(imageIdx)->rect;
     bool badRect = ToRectF(imgRect) != rect;
-    CrashIf(outOfBounds);
-    CrashIf(badRect);
+    ReportIf(outOfBounds);
+    ReportIf(badRect);
     if (outOfBounds || badRect) {
         return nullptr;
     }
@@ -3096,7 +3096,7 @@ RenderedBitmap* EngineMupdf::GetPageImage(int pageNo, RectF rect, int imageIdx)
     ScopedCritSec scope(ctxAccess);
 
     fz_image* image = FzFindImageAtIdx(ctx, pageInfo, imageIdx);
-    CrashIf(!image);
+    ReportIf(!image);
     if (!image) {
         return nullptr;
     }
@@ -3276,7 +3276,7 @@ TempStr EngineMupdf::ExtractFontListTemp() {
             fz_report_error(ctx);
             continue;
         }
-        CrashIf(!name || !type || !encoding);
+        ReportIf(!name || !type || !encoding);
 
         str::Str info;
         if (name[0] < 0 && MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, name, -1, nullptr, 0)) {
@@ -3375,7 +3375,7 @@ TempStr EngineMupdf::GetPropertyTemp(const char* name) {
             int n = pdf_array_len(ctx, pdf_dict_gets(ctx, pdfInfo, "OutputIntents"));
             for (int i = 0; i < n; i++) {
                 pdf_obj* intent = pdf_array_get(ctx, pdf_dict_gets(ctx, pdfInfo, "OutputIntents"), i);
-                CrashIf(!str::StartsWith(pdf_to_name(ctx, intent), "GTS_"));
+                ReportIf(!str::StartsWith(pdf_to_name(ctx, intent), "GTS_"));
                 const char* s = pdf_to_name(ctx, intent) + 4;
                 fstruct.Append(s);
             }
@@ -3492,7 +3492,7 @@ const pdf_write_options pdf_default_write_options2 = {
 // if filePath is not given, we save under the same name
 // TODO: if the file is locked, this might fail.
 bool EngineMupdfSaveUpdated(EngineBase* engine, const char* path, std::function<void(const char*)> showErrorFunc) {
-    CrashIf(!engine);
+    ReportIf(!engine);
     if (!engine) {
         return false;
     }
@@ -3750,7 +3750,7 @@ ByteSlice EngineMupdfLoadAttachment(EngineBase* engine, int attachmentNo) {
 // if an elements fully obscures another, remove it from the list
 static bool RemoveHeWhoFullyContains(Vec<Annotation*>& els) {
     int n = els.Size();
-    CrashIf(n < 2);
+    ReportIf(n < 2);
     for (int i = 0; i < n; i++) {
         RectF r1 = els[i]->bounds;
         for (int j = 0; j < n; j++) {
@@ -3805,7 +3805,7 @@ Annotation* EngineMupdfGetAnnotationAtPos(EngineBase* engine, int pageNo, PointF
     }
     bool didRemove = RemoveHeWhoFullyContains(els);
     if (didRemove) {
-        CrashIf(els.Size() != n - 1);
+        ReportIf(els.Size() != n - 1);
         goto Encore;
     }
     return els[0];
@@ -3832,7 +3832,7 @@ NO_INLINE void MarkNotificationAsModified(EngineMupdf* e, Annotation* annot, Ann
         return;
     }
     int pageNo = annot->pageNo;
-    CrashIf(pageNo < 1 || pageNo > e->pageCount);
+    ReportIf(pageNo < 1 || pageNo > e->pageCount);
     int pageIdx = pageNo - 1;
 
     // EngineMupdf is the ultimate source of truth for Annotation* list
@@ -3848,20 +3848,20 @@ NO_INLINE void MarkNotificationAsModified(EngineMupdf* e, Annotation* annot, Ann
     if (change == AnnotationChange::Remove) {
         int sizeBefore = pageInfo->annotations.Size();
         int removedPos = pageInfo->annotations.Remove(annot);
-        CrashIf(removedPos < 0); // must exist
+        ReportIf(removedPos < 0); // must exist
         int sizeNow = pageInfo->annotations.Size();
-        CrashIf(sizeBefore != sizeNow + 1);
+        ReportIf(sizeBefore != sizeNow + 1);
         ValidateAnnotationsInSync(e, pageInfo);
     } else if (change == AnnotationChange::Add) {
         int sizeBefore = pageInfo->annotations.Size();
         int pos = pageInfo->annotations.Find(annot);
-        CrashIf(pos >= 0); // shouldn't exist
+        ReportIf(pos >= 0); // shouldn't exist
         pageInfo->annotations.Append(annot);
         int sizeNow = pageInfo->annotations.Size();
-        CrashIf(sizeBefore != sizeNow - 1);
+        ReportIf(sizeBefore != sizeNow - 1);
         ValidateAnnotationsInSync(e, pageInfo);
     } else {
-        CrashIf(change != AnnotationChange::Modify);
+        ReportIf(change != AnnotationChange::Modify);
     }
     auto ctx = e->Ctx();
     RebuildCommentsFromAnnotations(ctx, pageInfo);
@@ -3870,8 +3870,8 @@ NO_INLINE void MarkNotificationAsModified(EngineMupdf* e, Annotation* annot, Ann
 
 // creates Annotation wrapper around pdf_annot
 Annotation* MakeAnnotationWrapper(EngineMupdf* engine, pdf_annot* annot, int pageNo) {
-    CrashIf(pageNo < 1);
-    CrashIf(!engine->pdfdoc);
+    ReportIf(pageNo < 1);
+    ReportIf(!engine->pdfdoc);
     ScopedCritSec cs(engine->ctxAccess);
 
     AnnotationType typ = AnnotationType::Unknown;
diff --git a/src/EnginePs.cpp b/src/EnginePs.cpp
index d97b2a13065..4d576783943 100644
--- a/src/EnginePs.cpp
+++ b/src/EnginePs.cpp
@@ -356,7 +356,7 @@ class EnginePs : public EngineBase {
 
     bool Load(const char* fileName) {
         pageCount = 0;
-        CrashIf(FilePath() || pdfEngine);
+        ReportIf(FilePath() || pdfEngine);
         if (!fileName) {
             return false;
         }
diff --git a/src/ExternalViewers.cpp b/src/ExternalViewers.cpp
index a903d6bc0f6..ba37a27b075 100644
--- a/src/ExternalViewers.cpp
+++ b/src/ExternalViewers.cpp
@@ -280,7 +280,7 @@ static char* GetPDFXChangePathTemp() {
 }
 
 void DetectExternalViewers() {
-    CrashIf(gExternalViewersCount > 0); // only call once
+    ReportIf(gExternalViewersCount > 0); // only call once
 
     ExternalViewerInfo* info = nullptr;
     for (ExternalViewerInfo& i : gExternalViewers) {
diff --git a/src/Favorites.cpp b/src/Favorites.cpp
index cc7fd2cec6a..77590510861 100644
--- a/src/Favorites.cpp
+++ b/src/Favorites.cpp
@@ -114,13 +114,13 @@ bool FavTreeModel::IsChecked(TreeItem ti) {
 }
 
 void FavTreeModel::SetHandle(TreeItem ti, HTREEITEM hItem) {
-    CrashIf(ti < 0);
+    ReportIf(ti < 0);
     FavTreeItem* treeItem = (FavTreeItem*)ti;
     treeItem->hItem = hItem;
 }
 
 HTREEITEM FavTreeModel::GetHandle(TreeItem ti) {
-    CrashIf(ti < 0);
+    ReportIf(ti < 0);
     FavTreeItem* treeItem = (FavTreeItem*)ti;
     return treeItem->hItem;
 }
@@ -314,7 +314,7 @@ static TempStr FavCompactReadableNameTemp(FileState* fav, Favorite* fn, bool isC
 }
 
 static void AppendFavMenuItems(HMENU m, FileState* f, int& idx, bool combined, bool isCurrent) {
-    CrashIf(!f);
+    ReportIf(!f);
     if (!f) {
         return;
     }
@@ -408,7 +408,7 @@ static void AppendFavMenus(HMENU m, const char* currFilePath) {
     for (int i = 0; i < menusCount; i++) {
         const char* filePath = filePathsSorted.At(i);
         FileState* f = gFavorites.GetFavByFilePath(filePath);
-        CrashIf(!f);
+        ReportIf(!f);
         if (!f) {
             continue;
         }
@@ -489,7 +489,7 @@ static void GoToFavorite(MainWindow* win, int pageNo) {
 // Going to a bookmark in another file, loads the file and scrolls to a page
 // (similar to how invoking one of the recently opened files works)
 static void GoToFavorite(MainWindow* win, FileState* fs, Favorite* fn) {
-    CrashIf(!fs || !fn);
+    ReportIf(!fs || !fn);
     if (!fs || !fn) {
         return;
     }
@@ -602,7 +602,7 @@ static FavTreeModel* BuildFavTreeModel(MainWindow* win) {
     GetSortedFilePaths(filePathsSorted);
     for (char* path : filePathsSorted) {
         FileState* f = gFavorites.GetFavByFilePath(path);
-        CrashIf(!f);
+        ReportIf(!f);
         if (!f) {
             continue;
         }
@@ -762,14 +762,14 @@ void RememberFavTreeExpansionStateForAllWindows() {
 static void FavTreeItemClicked(TreeClickEvent* ev) {
     ev->didHandle = true;
     MainWindow* win = FindMainWindowByHwnd(ev->w->hwnd);
-    CrashIf(!win);
+    ReportIf(!win);
     GoToFavForTreeItem(win, ev->treeItem);
 }
 #endif
 
 static void FavTreeSelectionChanged(TreeSelectionChangedEvent* ev) {
     MainWindow* win = FindMainWindowByHwnd(ev->treeView->hwnd);
-    CrashIf(!win);
+    ReportIf(!win);
 
     // When the focus is set to the toc window the first item in the treeview is automatically
     // selected and a TVN_SELCHANGEDW notification message is sent with the special code pnmtv->action ==
@@ -901,7 +901,7 @@ void CreateFavorites(MainWindow* win) {
     // treeView->onMouseWheel = TocTreeMouseWheelHandler;
 
     treeView->Create(args);
-    CrashIf(!treeView->hwnd);
+    ReportIf(!treeView->hwnd);
 
     win->favTreeView = treeView;
 
diff --git a/src/FileHistory.cpp b/src/FileHistory.cpp
index bfac35492cf..2b1085371c9 100644
--- a/src/FileHistory.cpp
+++ b/src/FileHistory.cpp
@@ -56,7 +56,7 @@ static int cmpOpenCount(const void* a, const void* b) {
 }
 
 void FileHistory::Append(FileState* fs) const {
-    CrashIf(!fs->filePath);
+    ReportIf(!fs->filePath);
     states->Append(fs);
 }
 
@@ -135,7 +135,7 @@ FileState* FileHistory::FindByName(const char* filePath, size_t* idxOut) const {
 }
 
 FileState* FileHistory::MarkFileLoaded(const char* filePath) const {
-    CrashIf(!filePath);
+    ReportIf(!filePath);
     // if a history entry with the same name already exists,
     // then reuse it. That way we don't have duplicates and
     // the file moves to the front of the list
@@ -153,7 +153,7 @@ FileState* FileHistory::MarkFileLoaded(const char* filePath) const {
 }
 
 bool FileHistory::MarkFileInexistent(const char* filePath, bool hide) const {
-    CrashIf(!filePath);
+    ReportIf(!filePath);
     FileState* state = FindByPath(filePath);
     if (!state) {
         return false;
@@ -187,7 +187,7 @@ bool FileHistory::MarkFileInexistent(const char* filePath, bool hide) const {
 // and with all missing states filtered out
 // caller needs to delete the result (but not the contained states)
 void FileHistory::GetFrequencyOrder(Vec<FileState*>& list) const {
-    CrashIf(list.size() > 0);
+    ReportIf(list.size() > 0);
     size_t i = 0;
     for (FileState* ds : *states) {
         ds->index = i++;
diff --git a/src/FileThumbnails.cpp b/src/FileThumbnails.cpp
index d2f2b3f58fd..31ab7b6d7b5 100644
--- a/src/FileThumbnails.cpp
+++ b/src/FileThumbnails.cpp
@@ -123,7 +123,7 @@ bool HasThumbnail(FileState* ds) {
 
 // takes ownership of bmp
 void SetThumbnail(FileState* ds, RenderedBitmap* bmp) {
-    CrashIf(bmp && bmp->GetSize().IsEmpty());
+    ReportIf(bmp && bmp->GetSize().IsEmpty());
     if (!ds || !bmp || bmp->GetSize().IsEmpty()) {
         delete bmp;
         return;
@@ -145,7 +145,7 @@ void SaveThumbnail(FileState* ds) {
     }
     char* thumbsPath = path::GetDirTemp(bmpPath);
     if (dir::Create(thumbsPath)) {
-        CrashIf(!str::EndsWithI(bmpPath, ".png"));
+        ReportIf(!str::EndsWithI(bmpPath, ".png"));
         Gdiplus::Bitmap bmp(ds->thumbnail->GetBitmap(), nullptr);
         CLSID tmpClsid = GetEncoderClsid(L"image/png");
         WCHAR* bmpPathW = ToWStrTemp(bmpPath);
diff --git a/src/Flags.cpp b/src/Flags.cpp
index f4a24ee3a7d..19882f00b86 100755
--- a/src/Flags.cpp
+++ b/src/Flags.cpp
@@ -129,7 +129,7 @@ static void EnumeratePrinters() {
 
         DWORD bins = DeviceCapabilitiesW(nameW, portW, DC_BINS, nullptr, nullptr);
         DWORD binNames = DeviceCapabilitiesW(nameW, portW, DC_BINNAMES, nullptr, nullptr);
-        CrashIf(bins != binNames);
+        ReportIf(bins != binNames);
         if (0 == bins) {
             out.Append(" - no paper bins available\n");
         } else if (bins == (DWORD)-1) {
diff --git a/src/GlobalPrefs.cpp b/src/GlobalPrefs.cpp
index ab129b8fe88..082f5a313fe 100644
--- a/src/GlobalPrefs.cpp
+++ b/src/GlobalPrefs.cpp
@@ -100,7 +100,7 @@ TabState* NewTabState(FileState* fs) {
 }
 
 void ResetSessionState(Vec<SessionData*>* sessionData) {
-    CrashIf(!sessionData);
+    ReportIf(!sessionData);
     if (!sessionData) {
         return;
     }
diff --git a/src/HomePage.cpp b/src/HomePage.cpp
index d24ccb22ea6..3d953225b3b 100644
--- a/src/HomePage.cpp
+++ b/src/HomePage.cpp
@@ -314,7 +314,7 @@ static void UpdateAboutLayoutInfo(HWND hwnd, HDC hdc, Rect* rect) {
         if (el == &gAboutLayoutInfo[0]) {
             leftDy = el->leftPos.dy;
         } else {
-            CrashIf(leftDy != el->leftPos.dy);
+            ReportIf(leftDy != el->leftPos.dy);
         }
         if (leftLargestDx < el->leftPos.dx) {
             leftLargestDx = el->leftPos.dx;
@@ -334,7 +334,7 @@ static void UpdateAboutLayoutInfo(HWND hwnd, HDC hdc, Rect* rect) {
         if (el == &gAboutLayoutInfo[0]) {
             rightDy = el->rightPos.dy;
         } else {
-            CrashIf(rightDy != el->rightPos.dy);
+            ReportIf(rightDy != el->rightPos.dy);
         }
         if (rightLargestDx < el->rightPos.dx) {
             rightLargestDx = el->rightPos.dx;
@@ -459,7 +459,7 @@ LRESULT CALLBACK WndProcAbout(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
     int y = GET_Y_LPARAM(lp);
     switch (msg) {
         case WM_CREATE:
-            CrashIf(gHwndAbout);
+            ReportIf(gHwndAbout);
             break;
 
         case WM_ERASEBKGND:
@@ -509,7 +509,7 @@ LRESULT CALLBACK WndProcAbout(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
 
         case WM_DESTROY:
             DeleteInfotip();
-            CrashIf(!gHwndAbout);
+            ReportIf(!gHwndAbout);
             gHwndAbout = nullptr;
             break;
 
@@ -533,7 +533,7 @@ void ShowAboutWindow(MainWindow* win) {
         HMODULE h = GetModuleHandleW(nullptr);
         wcex.hIcon = LoadIcon(h, MAKEINTRESOURCE(GetAppIconID()));
         gAtomAbout = RegisterClassEx(&wcex);
-        CrashIf(!gAtomAbout);
+        ReportIf(!gAtomAbout);
     }
 
     TempWStr title = ToWStrTemp(_TRA("About SumatraPDF"));
diff --git a/src/HtmlFormatter.cpp b/src/HtmlFormatter.cpp
index bc362e14638..e936aec3ea0 100644
--- a/src/HtmlFormatter.cpp
+++ b/src/HtmlFormatter.cpp
@@ -163,7 +163,7 @@ HtmlFormatter::HtmlFormatter(HtmlFormatterArgs* args)
     currReparseIdx = args->reparseIdx;
     htmlParser = new HtmlPullParser((const char*)args->htmlStr.data(), args->htmlStr.size());
     htmlParser->SetCurrPosOff(currReparseIdx);
-    CrashIf(!ValidReparseIdx(currReparseIdx, htmlParser));
+    ReportIf(!ValidReparseIdx(currReparseIdx, htmlParser));
 
     gfx = mui::AllocGraphicsForMeasureText();
     textMeasure = CreateTextRender(args->textRenderMethod, gfx, 10, 10);
@@ -202,7 +202,7 @@ void HtmlFormatter::AppendInstr(const DrawInstr& di) {
     currLineInstr.Append(di);
     if (-1 == currLineReparseIdx) {
         currLineReparseIdx = currReparseIdx;
-        CrashIf(!ValidReparseIdx(currReparseIdx, htmlParser));
+        ReportIf(!ValidReparseIdx(currReparseIdx, htmlParser));
     }
 }
 
@@ -237,7 +237,7 @@ bool ValidStyleForChangeFontStyle(FontStyle fs) {
 // TODO: it doesn't corrctly support the case where a style is wrongly nested
 // like "<b>fo<i>oo</b>bar</i>" - "bar" should be italic but will be bold
 void HtmlFormatter::ChangeFontStyle(FontStyle fs, bool addStyle) {
-    CrashIf(!ValidStyleForChangeFontStyle(fs));
+    ReportIf(!ValidStyleForChangeFontStyle(fs));
     if (addStyle) {
         SetFontBasedOn(CurrFont(), (FontStyle)(fs | CurrFont()->GetStyle()));
     } else {
@@ -366,7 +366,7 @@ void HtmlFormatter::JustifyLineBoth() {
     if (extraSpaceDxTotal < 0.f)
         DumpLineDebugInfo();
 #endif
-    CrashIf(extraSpaceDxTotal < 0.f);
+    ReportIf(extraSpaceDxTotal < 0.f);
 
     LayoutLeftStartingAt(0.f);
     size_t spaces = 0;
@@ -420,7 +420,7 @@ bool HtmlFormatter::IsCurrLineEmpty() {
 
 void HtmlFormatter::JustifyCurrLine(AlignAttr align) {
     // TODO: is CurrLineDx needed at all?
-    CrashIf(currX != CurrLineDx());
+    ReportIf(currX != CurrLineDx());
 
     switch (align) {
         case AlignAttr::Left:
@@ -436,7 +436,7 @@ void HtmlFormatter::JustifyCurrLine(AlignAttr align) {
             JustifyLineBoth();
             break;
         default:
-            CrashIf(true);
+            ReportIf(true);
             break;
     }
 
@@ -517,9 +517,9 @@ bool HtmlFormatter::FlushCurrLine(bool isParagraphBreak) {
         pagesToSend.Append(currPage);
         // instructions for each page need to be self-contained
         // so we have to carry over some state (like current font)
-        CrashIf(!CurrFont());
+        ReportIf(!CurrFont());
         EmitNewPage();
-        CrashIf(currLineReparseIdx > INT_MAX);
+        ReportIf(currLineReparseIdx > INT_MAX);
         currPage->reparseIdx = (int)currLineReparseIdx;
         createdPage = true;
     }
@@ -546,14 +546,14 @@ bool HtmlFormatter::FlushCurrLine(bool isParagraphBreak) {
 }
 
 void HtmlFormatter::EmitNewPage() {
-    CrashIf(currReparseIdx > INT_MAX);
+    ReportIf(currReparseIdx > INT_MAX);
     currPage = new HtmlPage((int)currReparseIdx);
     currPage->instructions.Append(DrawInstr::SetFont(nextPageStyle.font));
     currY = 0.f;
 }
 
 void HtmlFormatter::EmitEmptyLine(float lineDy) {
-    CrashIf(!IsCurrLineEmpty());
+    ReportIf(!IsCurrLineEmpty());
     currY += lineDy;
     if (currY <= pageDy) {
         currX = NewLineX();
@@ -590,7 +590,7 @@ static bool HasPreviousLineSingleImage(Vec<DrawInstr>& instrs) {
 }
 
 bool HtmlFormatter::EmitImage(const ByteSlice* img) {
-    CrashIf(img->empty());
+    ReportIf(img->empty());
     Size imgSize = BitmapSizeFromData(*img);
     if (imgSize.IsEmpty()) {
         return false;
@@ -634,7 +634,7 @@ bool HtmlFormatter::EmitImage(const ByteSlice* img) {
 void HtmlFormatter::EmitHr() {
     // hr creates an implicit paragraph break
     FlushCurrLine(true);
-    CrashIf(NewLineX() != currX);
+    ReportIf(NewLineX() != currX);
     RectF bbox(0.f, 0.f, pageDx, lineSpacing);
     AppendInstr(DrawInstr(DrawInstrType::Line, bbox));
     FlushCurrLine(true);
@@ -642,7 +642,7 @@ void HtmlFormatter::EmitHr() {
 
 void HtmlFormatter::EmitParagraph(float indent) {
     FlushCurrLine(true);
-    CrashIf(NewLineX() != currX);
+    ReportIf(NewLineX() != currX);
     bool needsIndent = AlignAttr::Left == CurrStyle()->align || AlignAttr::Justify == CurrStyle()->align;
     if (indent > 0 && needsIndent && EnsureDx(indent)) {
         AppendInstr(DrawInstr::FixedSpace(indent));
@@ -702,8 +702,8 @@ static bool CanBreakWordOnChar(WCHAR c) {
 // a text run is a string of consecutive text with uniform style
 void HtmlFormatter::EmitTextRun(const char* s, const char* end) {
     currReparseIdx = s - htmlParser->Start();
-    CrashIf(!ValidReparseIdx(currReparseIdx, htmlParser));
-    CrashIf(IsSpaceOnly(s, end) && !preFormatted);
+    ReportIf(!ValidReparseIdx(currReparseIdx, htmlParser));
+    ReportIf(IsSpaceOnly(s, end) && !preFormatted);
     const char* tmp = ResolveHtmlEntities(s, end, textAllocator);
     bool resolved = tmp != s;
     if (resolved) {
@@ -762,7 +762,7 @@ void HtmlFormatter::EmitTextRun(const char* s, const char* end) {
 
         textMeasure->SetFont(CurrFont());
         bbox = ToGdipRectF(textMeasure->Measure(buf, lenThatFits));
-        CrashIf(bbox.dx > pageDx);
+        ReportIf(bbox.dx > pageDx);
         // s is UTF-8 and buf is UTF-16, so one
         // WCHAR doesn't always equal one char
         // TODO: this usually fails for non-BMP characters (i.e. hardly ever)
@@ -1053,14 +1053,14 @@ void HtmlFormatter::HandleTagStyle(HtmlToken* t) {
         return;
     }
     const char* end = t->s - 2;
-    CrashIf(start > end);
+    ReportIf(start > end);
     ParseStyleSheet(start, end - start);
     UpdateTagNesting(t);
 }
 
 // returns true if prev can't contain curr and should thus be closed
 static bool AutoCloseOnOpen(HtmlTag curr, HtmlTag prev) {
-    CrashIf(IsInlineTag(curr));
+    ReportIf(IsInlineTag(curr));
     // always start afresh for a new <body>
     if (Tag_Body == curr) {
         return true;
@@ -1109,7 +1109,7 @@ void HtmlFormatter::AutoCloseTags(size_t count) {
 }
 
 void HtmlFormatter::UpdateTagNesting(HtmlToken* t) {
-    CrashIf(!t->IsTag());
+    ReportIf(!t->IsTag());
     if (keepTagNesting || Tag_NotFound == t->tag || t->IsEmptyElementEndTag() || IsTagSelfClosing(t->tag)) {
         return;
     }
@@ -1142,13 +1142,13 @@ void HtmlFormatter::UpdateTagNesting(HtmlToken* t) {
     if (t->IsStartTag()) {
         tagNesting.Append(t->tag);
     } else {
-        CrashIf(!t->IsEndTag() || t->tag != tagNesting.Last());
+        ReportIf(!t->IsEndTag() || t->tag != tagNesting.Last());
         tagNesting.Pop();
     }
 }
 
 void HtmlFormatter::HandleHtmlTag(HtmlToken* t) {
-    CrashIf(!t->IsTag());
+    ReportIf(!t->IsTag());
 
     UpdateTagNesting(t);
 
@@ -1247,7 +1247,7 @@ void HtmlFormatter::HandleHtmlTag(HtmlToken* t) {
 }
 
 void HtmlFormatter::HandleText(HtmlToken* t) {
-    CrashIf(!t->IsText());
+    ReportIf(!t->IsText());
     HandleText(t->s, t->sLen);
 }
 
@@ -1359,7 +1359,7 @@ HtmlPage* HtmlFormatter::Next(bool skipEmptyPages) {
         }
 
         currReparseIdx = t->GetReparsePoint() - htmlParser->Start();
-        CrashIf(!ValidReparseIdx(currReparseIdx, htmlParser));
+        ReportIf(!ValidReparseIdx(currReparseIdx, htmlParser));
         if (t->IsTag()) {
             HandleHtmlTag(t);
         } else if (!IgnoreText()) {
@@ -1439,10 +1439,10 @@ void DrawHtmlPage(Graphics* g, mui::ITextRender* textDraw, Vec<DrawInstr>* drawI
             Gdiplus::PointF p2(bbox.x + bbox.dx, y);
             if (showBbox) {
                 status = g->DrawRectangle(&debugPen, ToGdipRectF(bbox));
-                CrashIf(status != Ok);
+                ReportIf(status != Ok);
             }
             status = g->DrawLine(&linePen, p1, p2);
-            CrashIf(status != Ok);
+            ReportIf(status != Ok);
         } else if (DrawInstrType::Image == i.type) {
             // TODO: cache the bitmap somewhere (?)
             Bitmap* bmp = BitmapFromData(i.GetImage());
@@ -1450,7 +1450,7 @@ void DrawHtmlPage(Graphics* g, mui::ITextRender* textDraw, Vec<DrawInstr>* drawI
                 status = g->DrawImage(bmp, ToGdipRectF(bbox), 0, 0, (float)bmp->GetWidth(), (float)bmp->GetHeight(),
                                       UnitPixel);
                 // GDI+ sometimes seems to succeed in loading an image because it lazily decodes it
-                CrashIf(status != Ok && status != Win32Error);
+                ReportIf(status != Ok && status != Win32Error);
             }
             delete bmp;
         } else if (DrawInstrType::LinkStart == i.type) {
@@ -1460,11 +1460,11 @@ void DrawHtmlPage(Graphics* g, mui::ITextRender* textDraw, Vec<DrawInstr>* drawI
             Gdiplus::PointF p2(bbox.x + bbox.dx, y);
             Pen linkPen(textColor);
             status = g->DrawLine(&linkPen, p1, p2);
-            CrashIf(status != Ok);
+            ReportIf(status != Ok);
         } else if (DrawInstrType::String == i.type || DrawInstrType::RtlString == i.type) {
             if (showBbox) {
                 status = g->DrawRectangle(&debugPen, ToGdipRectF(bbox));
-                CrashIf(status != Ok);
+                ReportIf(status != Ok);
             }
         } else if (DrawInstrType::LinkEnd == i.type) {
             // TODO: set text color back again
@@ -1472,7 +1472,7 @@ void DrawHtmlPage(Graphics* g, mui::ITextRender* textDraw, Vec<DrawInstr>* drawI
                    (DrawInstrType::SetFont == i.type) || (DrawInstrType::Anchor == i.type)) {
             // ignore
         } else {
-            CrashIf(true);
+            ReportIf(true);
         }
         if (abortCookie && *abortCookie) {
             break;
diff --git a/src/HtmlFormatter.h b/src/HtmlFormatter.h
index f23769ac2d7..39c72ad52a7 100644
--- a/src/HtmlFormatter.h
+++ b/src/HtmlFormatter.h
@@ -65,7 +65,7 @@ struct DrawInstr {
     explicit DrawInstr(DrawInstrType t, RectF bbox = {}) : type(t), bbox(bbox) {
     }
     ByteSlice GetImage() {
-        CrashIf(type != DrawInstrType::Image);
+        ReportIf(type != DrawInstrType::Image);
         return {(u8*)str.s, str.len};
     }
 
diff --git a/src/Installer.cpp b/src/Installer.cpp
index ee7aca7ba0b..a52a60ee507 100644
--- a/src/Installer.cpp
+++ b/src/Installer.cpp
@@ -736,7 +736,7 @@ static void CreateInstallerWindowControls(InstallerWnd* wnd) {
     eargs.withBorder = true;
     wnd->editInstallationDir = new Edit();
     HWND ehwnd = wnd->editInstallationDir->Create(eargs);
-    CrashIf(!ehwnd);
+    ReportIf(!ehwnd);
 
     wnd->editInstallationDir->SetText(gCli->installDir);
     rc = {x, y, x + dx, y + staticDy};
@@ -873,7 +873,7 @@ static bool CreateInstallerWindow() {
         wcex.hIcon = LoadIconW(h, resName);
 
         ATOM atom = RegisterClassExW(&wcex);
-        CrashIf(!atom);
+        ReportIf(!atom);
         if (atom == 0) {
             logf("CreateInstallerWindow: RegisterClassExW() failed\n");
             return false;
@@ -1047,7 +1047,7 @@ bool MaybeMismatchedOSDialog(HWND hwndParent) {
     int buttonPressedId = 0;
 
     auto hr = TaskDialogIndirect(&dialogConfig, &buttonPressedId, nullptr, nullptr);
-    CrashIf(hr == E_INVALIDARG);
+    ReportIf(hr == E_INVALIDARG);
     if (buttonPressedId == kBtnIdDownload) {
         const char* url = "https://www.sumatrapdfreader.org/download-free-pdf-viewer";
         if (gIsPreReleaseBuild) {
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 1958701c4b4..b2e75f06c03 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -49,7 +49,7 @@ struct LinkHandler : ILinkHandler {
     MainWindow* win = nullptr;
 
     explicit LinkHandler(MainWindow* w) {
-        CrashIf(!w);
+        ReportIf(!w);
         win = w;
     }
     ~LinkHandler() override;
@@ -110,17 +110,17 @@ void CreateMovePatternLazy(MainWindow* win) {
         return;
     }
     win->bmpMovePattern = CreateBitmap(8, 8, 1, 1, dotPatternBmp);
-    CrashIf(!win->bmpMovePattern);
+    ReportIf(!win->bmpMovePattern);
     win->brMovePattern = CreatePatternBrush(win->bmpMovePattern);
-    CrashIf(!win->brMovePattern);
+    ReportIf(!win->brMovePattern);
 }
 
 MainWindow::~MainWindow() {
     FinishStressTest(this);
 
-    CrashIf(TabCount() > 0);
-    // CrashIf(ctrl); // TODO: seen in crash report
-    CrashIf(linkOnLastButtonDown);
+    ReportIf(TabCount() > 0);
+    // ReportIf(ctrl); // TODO: seen in crash report
+    ReportIf(linkOnLastButtonDown);
 
     UnsubclassToc(this);
 
@@ -214,7 +214,7 @@ WindowTab* MainWindow::CurrentTab() const {
     }
 #if 0
     int nTabs = TabCount();
-    CrashIf(nTabs > 0);
+    ReportIf(nTabs > 0);
     if (nTabs > 0) {
         curr = GetTab(0);
         return curr;
@@ -297,7 +297,7 @@ Size MainWindow::GetViewPortSize() const {
     if ((style & WS_HSCROLL)) {
         size.dy += GetSystemMetrics(SM_CYHSCROLL);
     }
-    CrashIf((style & (WS_VSCROLL | WS_HSCROLL)) && !AsFixed());
+    ReportIf((style & (WS_VSCROLL | WS_HSCROLL)) && !AsFixed());
     return size;
 }
 
@@ -362,7 +362,7 @@ void MainWindow::ToggleZoom() const {
 }
 
 void MainWindow::MoveDocBy(int dx, int dy) const {
-    CrashIf(!CurrentTab());
+    ReportIf(!CurrentTab());
     CurrentTab()->MoveDocBy(dx, dy);
 }
 
@@ -394,7 +394,7 @@ bool MainWindow::CreateUIAProvider() {
 }
 
 void LinkHandler::GotoLink(IPageDestination* dest) {
-    CrashIf(!win || win->linkHandler != this);
+    ReportIf(!win || win->linkHandler != this);
     if (!dest || !win || !win->IsDocLoaded()) {
         return;
     }
@@ -608,7 +608,7 @@ IPageDestination* LinkHandler::FindTocItem(TocItem* item, const char* name, bool
 }
 
 void LinkHandler::GotoNamedDest(const char* name) {
-    CrashIf(!win || win->linkHandler != this);
+    ReportIf(!win || win->linkHandler != this);
     DocController* ctrl = win->ctrl;
     if (!ctrl) {
         return;
diff --git a/src/Menu.cpp b/src/Menu.cpp
index 92ce7c0540f..ea7b3bebc00 100644
--- a/src/Menu.cpp
+++ b/src/Menu.cpp
@@ -1059,11 +1059,11 @@ static TempStr ShortenStringUtf8Temp(char* s, int maxRunes) {
     int n;
     for (int i = 0; i < nRunes; i++) {
         n = utf8RuneLen((const u8*)s);
-        CrashIf(n <= 0);
+        ReportIf(n <= 0);
         if (i < removeStartingAt || i >= removeStartingAt + toRemove) {
             switch (n) {
                 default:
-                    CrashIf(true);
+                    ReportIf(true);
                     break;
                 case 4:
                     *tmp++ = *s++;
@@ -1303,7 +1303,7 @@ static void RebuildFileMenu(WindowTab* tab, HMENU menu) {
 }
 
 HMENU BuildMenuFromMenuDef(MenuDef* menuDef, HMENU menu, BuildMenuCtx* ctx) {
-    CrashIf(!menu);
+    ReportIf(!menu);
 
     bool isDebugMenu = menuDef == menuDefDebug;
     int i = 0;
@@ -1463,12 +1463,12 @@ float ZoomMenuItemToZoom(int menuItemId) {
             return it.zoom;
         }
     }
-    CrashIf(true);
+    ReportIf(true);
     return 100.0;
 }
 
 static void ZoomMenuItemCheck(HMENU m, int menuItemId, bool canZoom) {
-    CrashIf((CmdZoomFirst > menuItemId) || (menuItemId > CmdZoomLast));
+    ReportIf((CmdZoomFirst > menuItemId) || (menuItemId > CmdZoomLast));
 
     for (auto&& it : gZoomMenuIds) {
         MenuSetEnabled(m, it.itemId, canZoom);
@@ -1559,7 +1559,7 @@ void MenuUpdateDisplayMode(MainWindow* win) {
     } else if (IsBookView(displayMode)) {
         id = CmdBookView;
     } else {
-        CrashIf(win->ctrl || DisplayMode::Automatic != displayMode);
+        ReportIf(win->ctrl || DisplayMode::Automatic != displayMode);
     }
 
     CheckMenuRadioItem(win->menu, CmdViewLayoutFirst, CmdViewLayoutLast, id, MF_BYCOMMAND);
@@ -1647,7 +1647,7 @@ void OnAboutContextMenu(MainWindow* win, int x, int y) {
     }
 
     FileState* fs = gFileHistory.FindByPath(path);
-    CrashIf(!fs);
+    ReportIf(!fs);
     if (!fs) {
         return;
     }
@@ -1705,7 +1705,7 @@ static TempStr CleanupURLForClipbardCopyTemp(const char* s) {
 
 void OnWindowContextMenu(MainWindow* win, int x, int y) {
     DisplayModel* dm = win->AsFixed();
-    CrashIf(!dm);
+    ReportIf(!dm);
     if (!dm) {
         return;
     }
@@ -1839,7 +1839,7 @@ void OnWindowContextMenu(MainWindow* win, int x, int y) {
             // note: those are duplicated in SumatraPDF.cpp to enable keyboard shortcuts for them
 #if 0
         case CmdSelectAnnotation:
-            CrashIf(!buildCtx.annotationUnderCursor);
+            ReportIf(!buildCtx.annotationUnderCursor);
             [[fallthrough]];
 #endif
 
@@ -1968,7 +1968,7 @@ void FreeMenuOwnerDrawInfoData(HMENU hmenu) {
     for (int i = 0; i < n; i++) {
         mii.fMask = MIIM_DATA | MIIM_FTYPE | MIIM_SUBMENU;
         BOOL ok = GetMenuItemInfoW(hmenu, (uint)i, TRUE /* by position */, &mii);
-        CrashIf(!ok);
+        ReportIf(!ok);
         auto modi = (MenuOwnerDrawInfo*)mii.dwItemData;
         if (modi != nullptr) {
             FreeMenuOwnerDrawInfo(modi);
@@ -2023,7 +2023,7 @@ void MarkMenuOwnerDraw(HMENU hmenu) {
         mii.dwTypeData = &(buf[0]);
         mii.cch = dimof(buf);
         BOOL ok = GetMenuItemInfoW(hmenu, (uint)i, TRUE /* by position */, &mii);
-        CrashIf(!ok);
+        ReportIf(!ok);
         mii.fMask = MIIM_FTYPE | MIIM_DATA;
         mii.fType |= MFT_OWNERDRAW;
         if (mii.dwItemData != 0) {
@@ -2190,7 +2190,7 @@ void MenuCustomDrawItem(HWND hwnd, DRAWITEMSTRUCT* dis) {
     };
 
     if (isSeparator) {
-        CrashIf(modi->text);
+        ReportIf(modi->text);
         int sx = rc.left + cxCheckMark;
         int y = rc.top + (rcDy / 2);
         int ex = rc.right - padX;
@@ -2265,7 +2265,7 @@ HMENU BuildMenu(MainWindow* win) {
 }
 
 void UpdateAppMenu(MainWindow* win, HMENU m) {
-    CrashIf(!win);
+    ReportIf(!win);
     if (!win) {
         return;
     }
@@ -2284,7 +2284,7 @@ void UpdateAppMenu(MainWindow* win, HMENU m) {
 // show/hide top-level menu bar. This doesn't persist across launches
 // so that accidental removal of the menu isn't catastrophic
 void ToggleMenuBar(MainWindow* win, bool showTemporarily) {
-    CrashIf(!win->menu);
+    ReportIf(!win->menu);
 
     if (win->presentation || win->isFullScreen) {
         return;
diff --git a/src/MobiDoc.cpp b/src/MobiDoc.cpp
index 2edc9cf8633..c15bb318e12 100644
--- a/src/MobiDoc.cpp
+++ b/src/MobiDoc.cpp
@@ -62,7 +62,7 @@ static void DecodePalmDocHeader(const u8* buf, PalmDocHeader* hdr) {
     hdr->maxRecSize = d.UInt16();
     hdr->currPos = d.UInt32();
 
-    CrashIf(kPalmDocHeaderLen != d.Offset());
+    ReportIf(kPalmDocHeaderLen != d.Offset());
 }
 
 // http://wiki.mobileread.com/wiki/MOBI#MOBI_Header
@@ -323,13 +323,13 @@ static void ReadHuffReader(HuffHeader& huffHdr, ByteOrderDecoder& d) {
     huffHdr.baseTableOffset = d.UInt32();
     huffHdr.cacheLEOffset = d.UInt32();
     huffHdr.baseTableLEOffset = d.UInt32();
-    CrashIf(d.Offset() != kHuffHeaderLen);
+    ReportIf(d.Offset() != kHuffHeaderLen);
 }
 
 bool HuffDicDecompressor::SetHuffData(u8* huffData, size_t huffDataLen) {
     // for now catch cases where we don't have both big endian and little endian
     // versions of the data
-    CrashIf(kHuffRecordLen != huffDataLen);
+    ReportIf(kHuffRecordLen != huffDataLen);
     // but conservatively assume we only need big endian version
     if (huffDataLen < kHuffRecordMinLen) {
         return false;
@@ -343,7 +343,7 @@ bool HuffDicDecompressor::SetHuffData(u8* huffData, size_t huffDataLen) {
         return false;
     }
 
-    CrashIf(huffHdr.hdrLen != kHuffHeaderLen);
+    ReportIf(huffHdr.hdrLen != kHuffHeaderLen);
     if (huffHdr.hdrLen != kHuffHeaderLen) {
         return false;
     }
@@ -360,7 +360,7 @@ bool HuffDicDecompressor::SetHuffData(u8* huffData, size_t huffDataLen) {
     for (int i = 0; i < kBaseTableItemCount; i++) {
         baseTable[i] = d.UInt32();
     }
-    CrashIf(d.Offset() != kHuffRecordMinLen);
+    ReportIf(d.Offset() != kHuffRecordMinLen);
     return true;
 }
 
@@ -379,10 +379,10 @@ bool HuffDicDecompressor::AddCdicData(u8* cdicData, u32 cdicDataLen) {
     if (0 == codeLength) {
         codeLength = codeLen;
     } else {
-        CrashIf(codeLen != codeLength);
+        ReportIf(codeLen != codeLength);
         codeLength = std::min(codeLength, codeLen);
     }
-    CrashIf(hdrLen != kCdicHeaderLen);
+    ReportIf(hdrLen != kCdicHeaderLen);
     if (hdrLen != kCdicHeaderLen) {
         return false;
     }
@@ -432,7 +432,7 @@ static void DecodeMobiDocHeader(const u8* buf, MobiHeader* hdr) {
     hdr->huffmanTableOffset = d.UInt32();
     hdr->huffmanTableLen = d.UInt32();
     hdr->exthFlags = d.UInt32();
-    CrashIf(kMobiHeaderMinLen != d.Offset());
+    ReportIf(kMobiHeaderMinLen != d.Offset());
 
     if (hdr->hdrLen < kMobiHeaderMinLen + 48) {
         return;
@@ -452,9 +452,9 @@ static void DecodeMobiDocHeader(const u8* buf, MobiHeader* hdr) {
     hdr->extraDataFlags = d.UInt16();
     if (hdr->hdrLen >= 232) {
         hdr->indxRec = d.UInt32();
-        CrashIf(kMobiHeaderLen != d.Offset());
+        ReportIf(kMobiHeaderLen != d.Offset());
     } else {
-        CrashIf(kMobiHeaderLen - 4 != d.Offset());
+        ReportIf(kMobiHeaderLen - 4 != d.Offset());
     }
 }
 
@@ -476,7 +476,7 @@ MobiDoc::~MobiDoc() {
 }
 
 bool MobiDoc::ParseHeader() {
-    CrashIf(!pdbReader);
+    ReportIf(!pdbReader);
     if (!pdbReader) {
         return false;
     }
@@ -575,14 +575,14 @@ bool MobiDoc::ParseHeader() {
     }
 
     if (COMPRESSION_HUFF == compressionType) {
-        CrashIf(PdbDocType::Mobipocket != docType);
+        ReportIf(PdbDocType::Mobipocket != docType);
         rec = pdbReader->GetRecord(mobiHdr.huffmanFirstRec);
         size_t huffRecSize = rec.size();
         u8* recData = rec.data();
         if (!recData) {
             return false;
         }
-        CrashIf(nullptr != huffDic);
+        ReportIf(nullptr != huffDic);
         huffDic = new HuffDicDecompressor();
         if (!huffDic->SetHuffData((u8*)recData, huffRecSize)) {
             return false;
@@ -859,7 +859,7 @@ bool MobiDoc::LoadForPdbReader(PdbReader* pdbReader) {
         return false;
     }
 
-    CrashIf(doc != nullptr);
+    ReportIf(doc != nullptr);
     doc = new str::Str(docUncompressedSize);
     size_t nFailed = 0;
     for (size_t i = 1; i <= docRecCount; i++) {
diff --git a/src/Notifications.cpp b/src/Notifications.cpp
index 9020cbaaff8..a6a71a44713 100644
--- a/src/Notifications.cpp
+++ b/src/Notifications.cpp
@@ -212,7 +212,7 @@ HWND NotificationWnd::Create(const NotificationCreateArgs& args) {
 }
 
 void NotificationWnd::UpdateProgress(int current, int total) {
-    CrashIf(total <= 0);
+    ReportIf(total <= 0);
     if (total <= 0) {
         total = 1;
     }
@@ -387,7 +387,7 @@ void NotificationWnd::OnPaint(HDC hdcIn, PAINTSTRUCT* ps) {
 }
 
 void NotificationWnd::OnTimer(UINT_PTR timerId) {
-    CrashIf(kNotifTimerTimeoutId != timerId);
+    ReportIf(kNotifTimerTimeoutId != timerId);
     // TODO a better way to delete myself
     if (wndRemovedCb) {
         uitask::Post(TaskNotifOnTimerRemove, [this] { wndRemovedCb(this); });
@@ -442,7 +442,7 @@ LRESULT NotificationWnd::WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
 }
 
 static void NotifsRemoveForGroup(Vec<NotificationWnd*>& wnds, Kind groupId) {
-    CrashIf(groupId == nullptr);
+    ReportIf(groupId == nullptr);
     Vec<NotificationWnd*> toRemove;
     for (auto* wnd : wnds) {
         if (wnd->groupId == groupId) {
@@ -470,7 +470,7 @@ static void NotifsAdd(NotificationWnd* wnd, Kind groupId) {
 }
 
 NotificationWnd* NotifsGetForGroup(Vec<NotificationWnd*>& wnds, Kind groupId) {
-    CrashIf(!groupId);
+    ReportIf(!groupId);
     for (auto* wnd : wnds) {
         if (wnd->groupId == groupId) {
             return wnd;
@@ -480,7 +480,7 @@ NotificationWnd* NotifsGetForGroup(Vec<NotificationWnd*>& wnds, Kind groupId) {
 }
 
 NotificationWnd* ShowNotification(const NotificationCreateArgs& args) {
-    CrashIf(!args.hwndParent);
+    ReportIf(!args.hwndParent);
 
     NotificationWnd* wnd = new NotificationWnd();
     wnd->Create(args);
diff --git a/src/PalmDbReader.cpp b/src/PalmDbReader.cpp
index cbc5270f31e..e56333d8a04 100644
--- a/src/PalmDbReader.cpp
+++ b/src/PalmDbReader.cpp
@@ -47,7 +47,7 @@ static bool DecodePdbHeader(ByteOrderDecoder& dec, PdbHeader* hdr) {
 }
 
 bool PdbReader::ParseHeader() {
-    CrashIf(recInfos.size() > 0);
+    ReportIf(recInfos.size() > 0);
 
     ByteOrderDecoder dec(data, dataSize, ByteOrderDecoder::BigEndian);
     bool ok = DecodePdbHeader(dec, &hdr);
@@ -105,7 +105,7 @@ size_t PdbReader::GetRecordCount() {
 // don't free, memory is owned by us
 ByteSlice PdbReader::GetRecord(size_t recNo) {
     size_t nRecs = recInfos.size();
-    CrashIf(recNo >= nRecs);
+    ReportIf(recNo >= nRecs);
     if (recNo >= nRecs) {
         return {};
     }
@@ -114,7 +114,7 @@ ByteSlice PdbReader::GetRecord(size_t recNo) {
     if (recNo != nRecs - 1) {
         nextOff = recInfos[recNo + 1].offset;
     }
-    CrashIf(off > nextOff);
+    ReportIf(off > nextOff);
     size_t size = nextOff - off;
     return {(u8*)data + off, size};
 }
diff --git a/src/PdfCreator.cpp b/src/PdfCreator.cpp
index b4dfa92a9bb..0eae1544806 100644
--- a/src/PdfCreator.cpp
+++ b/src/PdfCreator.cpp
@@ -144,7 +144,7 @@ pdf_obj* add_image_res(fz_context* ctx, pdf_document* doc, pdf_obj* resources, c
 
 // based on create_page in pdfcreate.c
 bool PdfCreator::AddPageFromFzImage(fz_image* image, float imgDpi) const {
-    CrashIf(!ctx || !doc);
+    ReportIf(!ctx || !doc);
     if (!ctx || !doc) {
         return false;
     }
@@ -222,7 +222,7 @@ bool PdfCreator::AddPageFromGdiplusBitmap(Gdiplus::Bitmap* bmp, float imgDpi) {
 }
 
 bool PdfCreator::AddPageFromImageData(const ByteSlice& data, float imgDpi) const {
-    CrashIf(!ctx || !doc);
+    ReportIf(!ctx || !doc);
     if (!ctx || !doc || data.empty()) {
         return false;
     }
diff --git a/src/PdfSync.cpp b/src/PdfSync.cpp
index b0164324418..a12371a30a8 100644
--- a/src/PdfSync.cpp
+++ b/src/PdfSync.cpp
@@ -44,7 +44,7 @@ struct PdfsyncPoint {
 class Pdfsync : public Synchronizer {
   public:
     Pdfsync(const char* syncfilename, EngineBase* engine) : Synchronizer(syncfilename), engine(engine) {
-        CrashIf(!str::EndsWithI(syncfilename, ".pdfsync"));
+        ReportIf(!str::EndsWithI(syncfilename, ".pdfsync"));
     }
 
     int DocToSource(int pageNo, Point pt, AutoFreeStr& filename, int* line, int* col) override;
@@ -68,7 +68,7 @@ class SyncTex : public Synchronizer {
     SyncTex(const char* syncfilename, EngineBase* engineIn) : Synchronizer(syncfilename) {
         engine = engineIn;
         scanner = nullptr;
-        CrashIf(!str::EndsWithI(syncfilename, ".synctex"));
+        ReportIf(!str::EndsWithI(syncfilename, ".synctex"));
     }
 
     ~SyncTex() override {
@@ -364,7 +364,7 @@ int Pdfsync::DocToSource(int pageNo, Point pt, AutoFreeStr& filename, int* line,
     cmp.record = selected_record;
     PdfsyncLine* found =
         (PdfsyncLine*)bsearch(&cmp, lines.LendData(), lines.size(), sizeof(PdfsyncLine), cmpLineRecords);
-    CrashIf(!found);
+    ReportIf(!found);
     if (!found) {
         return PDFSYNCERR_NO_SYNC_AT_LOCATION;
     }
diff --git a/src/RegistryInstaller.cpp b/src/RegistryInstaller.cpp
index 87c85d05f01..5c3c2200a2b 100644
--- a/src/RegistryInstaller.cpp
+++ b/src/RegistryInstaller.cpp
@@ -345,7 +345,7 @@ void DoAssociateExeWithPdfExtension(HKEY hkey) {
     LoggedWriteRegStr(hkey, kRegClassesPdf LR"(\OpenWithProgids)", appName, L"");
     if (hkey == HKEY_CURRENT_USER) {
         LoggedWriteRegStr(hkey, kRegExplorerPdfExt, L"Progid", appName);
-        CrashIf(hkey == nullptr); // to appease prefast
+        ReportIf(hkey == nullptr); // to appease prefast
         LoggedDeleteRegValue(hkey, kRegExplorerPdfExt, L"Application");
         LoggedDeleteRegKey(hkey, kRegExplorerPdfExt LR"(\UserChoice)", true);
     }
diff --git a/src/RenderCache.cpp b/src/RenderCache.cpp
index 8c54e2c1228..792362678bc 100644
--- a/src/RenderCache.cpp
+++ b/src/RenderCache.cpp
@@ -45,7 +45,7 @@ RenderCache::RenderCache() {
 
     startRendering = CreateEvent(nullptr, FALSE, FALSE, nullptr);
     renderThread = CreateThread(nullptr, 0, RenderCacheThread, this, 0, nullptr);
-    CrashIf(nullptr == renderThread);
+    ReportIf(nullptr == renderThread);
 }
 
 RenderCache::~RenderCache() {
@@ -77,7 +77,7 @@ BitmapCacheEntry* RenderCache::Find(DisplayModel* dm, int pageNo, int rotation,
         if ((dm == e->dm) && (pageNo == e->pageNo) && (rotation == e->rotation) &&
             (kInvalidZoom == zoom || zoom == e->zoom) && (!tile || e->tile == *tile)) {
             e->refs++;
-            CrashIf(i != e->cacheIdx);
+            ReportIf(i != e->cacheIdx);
             return e;
         }
     }
@@ -94,23 +94,23 @@ bool RenderCache::Exists(DisplayModel* dm, int pageNo, int rotation, float zoom,
 
 bool RenderCache::DropCacheEntry(BitmapCacheEntry* entry) {
     ScopedCritSec scope(&cacheAccess);
-    CrashIf(!entry);
+    ReportIf(!entry);
     if (!entry) {
         return false;
     }
     int idx = entry->cacheIdx;
-    CrashIf(idx < 0);
-    CrashIf(idx >= cacheCount);
+    ReportIf(idx < 0);
+    ReportIf(idx >= cacheCount);
     if ((idx < 0) || (idx >= cacheCount)) {
         return false;
     }
-    CrashIf(entry->refs <= 0);
+    ReportIf(entry->refs <= 0);
     --entry->refs;
     if (entry->refs > 0) {
         return false;
     }
-    CrashIf(entry->refs != 0);
-    CrashIf(cache[idx] != entry);
+    ReportIf(entry->refs != 0);
+    ReportIf(cache[idx] != entry);
     logf("RenderCache::DropCacheEntry: pageNo: %d, rotation: %d, zoom: %.2f\n", entry->pageNo, entry->rotation,
          entry->zoom);
 
@@ -125,7 +125,7 @@ bool RenderCache::DropCacheEntry(BitmapCacheEntry* entry) {
         cache[lastIdx] = nullptr;
     }
     cacheCount--;
-    CrashIf(cacheCount < 0);
+    ReportIf(cacheCount < 0);
     return true;
 }
 
@@ -167,17 +167,17 @@ static bool FreeIfFull(RenderCache* rc, const PageRenderRequest& req) {
 
 void RenderCache::Add(PageRenderRequest& req, RenderedBitmap* bmp) {
     ScopedCritSec scope(&cacheAccess);
-    CrashIf(!req.dm);
+    ReportIf(!req.dm);
 
     req.rotation = NormalizeRotation(req.rotation);
-    CrashIf(cacheCount > MAX_BITMAPS_CACHED);
+    ReportIf(cacheCount > MAX_BITMAPS_CACHED);
 
     /* It's possible there still is a cached bitmap with different zoom/rotation */
     FreePage(req.dm, req.pageNo, &req.tile);
 
     bool hasSpace = FreeIfFull(this, req);
-    CrashIf(!hasSpace); // TODO: FreeIfFull() might actually fail to free
-    CrashIf(cacheCount > MAX_BITMAPS_CACHED);
+    ReportIf(!hasSpace); // TODO: FreeIfFull() might actually fail to free
+    ReportIf(cacheCount > MAX_BITMAPS_CACHED);
 
     // Copy the PageRenderRequest as it will be reused
     auto entry = new BitmapCacheEntry(req.dm, req.pageNo, req.rotation, req.zoom, req.tile, bmp);
@@ -187,7 +187,7 @@ void RenderCache::Add(PageRenderRequest& req, RenderedBitmap* bmp) {
 }
 
 static RectF GetTileRect(RectF pagerect, TilePosition tile) {
-    CrashIf(tile.res > 30);
+    ReportIf(tile.res > 30);
     RectF rect;
     rect.dx = pagerect.dx / (1ULL << tile.res);
     rect.dy = pagerect.dy / (1ULL << tile.res);
@@ -419,7 +419,7 @@ void RenderCache::RequestRendering(DisplayModel* dm, int pageNo) {
 void RenderCache::RequestRendering(DisplayModel* dm, int pageNo, TilePosition tile, bool clearQueueForPage) {
     logf("RenderCache::RequestRendering(): pageNo %d\n", pageNo);
     ScopedCritSec scope(&requestAccess);
-    CrashIf(!dm);
+    ReportIf(!dm);
     if (!dm || dm->dontRenderFlag) {
         return;
     }
@@ -483,12 +483,12 @@ void RenderCache::Render(DisplayModel* dm, int pageNo, int rotation, float zoom,
 bool RenderCache::Render(DisplayModel* dm, int pageNo, int rotation, float zoom, TilePosition* tile, RectF* pageRect,
                          RenderingCallback* renderCb) {
     logf("RenderCache::Render(): pageNo %d\n", pageNo);
-    CrashIf(!dm);
+    ReportIf(!dm);
     if (!dm || dm->dontRenderFlag) {
         return false;
     }
 
-    CrashIf(!(tile || pageRect && renderCb));
+    ReportIf(!(tile || pageRect && renderCb));
     if (!tile && !(pageRect && renderCb)) {
         return false;
     }
@@ -508,7 +508,7 @@ bool RenderCache::Render(DisplayModel* dm, int pageNo, int rotation, float zoom,
         newRequest = &(requests[requestCount]);
         requestCount++;
     }
-    CrashIf(requestCount > MAX_PAGE_REQUESTS);
+    ReportIf(requestCount > MAX_PAGE_REQUESTS);
 
     newRequest->dm = dm;
     newRequest->pageNo = pageNo;
@@ -520,7 +520,7 @@ bool RenderCache::Render(DisplayModel* dm, int pageNo, int rotation, float zoom,
     } else if (pageRect) {
         newRequest->pageRect = *pageRect;
         // can't cache bitmaps that aren't for a given tile
-        CrashIf(!renderCb);
+        ReportIf(!renderCb);
     } else {
         CrashMe();
     }
@@ -557,13 +557,13 @@ bool RenderCache::GetNextRequest(PageRenderRequest* req) {
         return false;
     }
 
-    CrashIf(requestCount < 0);
-    CrashIf(requestCount > MAX_PAGE_REQUESTS);
+    ReportIf(requestCount < 0);
+    ReportIf(requestCount > MAX_PAGE_REQUESTS);
     requestCount--;
     *req = requests[requestCount];
     curReq = req;
-    CrashIf(requestCount < 0);
-    CrashIf(req->abort);
+    ReportIf(requestCount < 0);
+    ReportIf(req->abort);
 
     return true;
 }
@@ -672,7 +672,7 @@ DWORD WINAPI RenderCache::RenderCacheThread(LPVOID data) {
             dm->textCache->GetTextForPage(req.pageNo);
         }
 
-        CrashIf(req.abortCookie != nullptr);
+        ReportIf(req.abortCookie != nullptr);
         EngineBase* engine = dm->GetEngine();
         engine->AddRef();
         RenderPageArgs args(req.pageNo, req.zoom, req.rotation, &req.pageRect, RenderTarget::View, &req.abortCookie);
@@ -783,7 +783,7 @@ int RenderCache::PaintTile(HDC hdc, Rect bounds, DisplayModel* dm, int pageNo, T
         if (renderOutOfDateCue) {
             *renderOutOfDateCue = true;
         }
-        CrashIf(renderedReplacement && !*renderedReplacement);
+        ReportIf(renderedReplacement && !*renderedReplacement);
     }
 
     DropCacheEntry(entry);
@@ -797,7 +797,7 @@ static int cmpTilePosition(const void* a, const void* b) {
 
 int RenderCache::Paint(HDC hdc, Rect bounds, DisplayModel* dm, int pageNo, PageInfo* pageInfo,
                        bool* renderOutOfDateCue) {
-    CrashIf(!pageInfo->shown || 0.0 == pageInfo->visibleRatio);
+    ReportIf(!pageInfo->shown || 0.0 == pageInfo->visibleRatio);
 
 #if 0
     auto timeStart = TimeGet();
diff --git a/src/Scratch.cpp b/src/Scratch.cpp
index a28f2050b0a..642ea0d0cd7 100644
--- a/src/Scratch.cpp
+++ b/src/Scratch.cpp
@@ -37,12 +37,12 @@ void TestUngzip() {
     const char* pathGz = R"(C:\Users\kjk\Downloads\AUTOSAR_TPS_SoftwareComponentTemplate.synctex.gz)";
     const char* path = R"(C:\Users\kjk\Downloads\AUTOSAR_TPS_SoftwareComponentTemplate.synctex)";
     ByteSlice uncomprFile = file::ReadFile(path);
-    CrashIf(uncomprFile.empty());
+    ReportIf(uncomprFile.empty());
     ByteSlice compr = file::ReadFile(pathGz);
-    CrashIf(compr.empty());
+    ReportIf(compr.empty());
     ByteSlice uncompr = Ungzip(compr);
     bool same = IsEqual(uncomprFile, uncompr);
-    CrashIf(!same);
+    ReportIf(!same);
 }
 
 struct BrowserTestWnd : Wnd {
@@ -84,7 +84,7 @@ void TestBrowser() {
         // TODO: if set, navigate to url doesn't work
         // args.visible = false;
         HWND hwnd = w->CreateCustom(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
     }
 
     {
@@ -97,7 +97,7 @@ void TestBrowser() {
         dy = rc.dy;
         args.pos = {10, 10, dx - 20, dy - 20};
         HWND hwnd = w->webView->Create(args);
-        CrashIf(!hwnd);
+        ReportIf(!hwnd);
         w->webView->SetIsVisible(true);
     }
 
diff --git a/src/SearchAndDDE.cpp b/src/SearchAndDDE.cpp
index 84d7e8d7789..790e156cbc8 100644
--- a/src/SearchAndDDE.cpp
+++ b/src/SearchAndDDE.cpp
@@ -175,7 +175,7 @@ void FindSelection(MainWindow* win, TextSearchDirection direction) {
 }
 
 static void ShowSearchResult(MainWindow* win, TextSel* result, bool addNavPt) {
-    CrashIf(0 == result->len || !result->pages || !result->rects);
+    ReportIf(0 == result->len || !result->pages || !result->rects);
     if (0 == result->len || !result->pages || !result->rects) {
         return;
     }
@@ -317,7 +317,7 @@ static void FindEndTask(MainWindow* win, FindThreadData* ftd, TextSel* textSel,
 
 static DWORD WINAPI FindThread(LPVOID data) {
     FindThreadData* ftd = (FindThreadData*)data;
-    CrashIf(!(ftd && ftd->win && ftd->win->ctrl && ftd->win->ctrl->AsFixed()));
+    ReportIf(!(ftd && ftd->win && ftd->win->ctrl && ftd->win->ctrl->AsFixed()));
     MainWindow* win = ftd->win;
     DisplayModel* dm = win->AsFixed();
     auto textSearch = dm->textSearch;
@@ -416,7 +416,7 @@ void FindTextOnThread(MainWindow* win, TextSearchDirection direction, bool showP
 }
 
 void PaintForwardSearchMark(MainWindow* win, HDC hdc) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     DisplayModel* dm = win->AsFixed();
     int pageNo = win->fwdSearchMark.page;
     PageInfo* pageInfo = dm->GetPageInfo(pageNo);
@@ -545,7 +545,7 @@ bool OnInverseSearch(MainWindow* win, int x, int y) {
 // Show the result of a PDF forward-search synchronization (initiated by a DDE command)
 void ShowForwardSearchResult(MainWindow* win, const char* fileName, int line, int /* col */, int ret, int page,
                              Vec<Rect>& rects) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     DisplayModel* dm = win->AsFixed();
     win->fwdSearchMark.rects.Reset();
     const PageInfo* pi = dm->GetPageInfo(page);
@@ -843,7 +843,7 @@ static const char* HandleOpenCmd(const char* cmd, bool* ack) {
     // TODO: not sure why this triggers. Seems to happen when opening multiple files
     // via Open menu in explorer. The first one is opened via cmd-line arg, the
     // rest via DDE.
-    // CrashIf(win && win->IsAboutWindow());
+    // ReportIf(win && win->IsAboutWindow());
     if (win) {
         if (forceRefresh) {
             logf("HandleOpenCmd: forceRefresh != 0 so calling ReloadDocument()\n");
@@ -1171,7 +1171,7 @@ LRESULT OnDDERequest(HWND hwnd, WPARAM wp, LPARAM lp) {
         data = (void*)tmp;
         cbData = (str::Leni(tmp) + 1) * 2;
     } else {
-        CrashIf(true);
+        ReportIf(true);
         return 0;
     }
 
diff --git a/src/Selection.cpp b/src/Selection.cpp
index 88fdfca5ad0..d617707151e 100644
--- a/src/Selection.cpp
+++ b/src/Selection.cpp
@@ -53,7 +53,7 @@ Vec<SelectionOnPage>* SelectionOnPage::FromRectangle(DisplayModel* dm, Rect rect
 
     for (int pageNo = dm->GetEngine()->PageCount(); pageNo >= 1; --pageNo) {
         PageInfo* pageInfo = dm->GetPageInfo(pageNo);
-        CrashIf(!(!pageInfo || 0.0 == pageInfo->visibleRatio || pageInfo->shown));
+        ReportIf(!(!pageInfo || 0.0 == pageInfo->visibleRatio || pageInfo->shown));
         if (!pageInfo || !pageInfo->shown) {
             continue;
         }
@@ -134,7 +134,7 @@ void PaintTransparentRectangles(HDC hdc, Rect screenRc, Vec<Rect>& rects, COLORR
 }
 
 void PaintSelection(MainWindow* win, HDC hdc) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
 
     Vec<Rect> rects;
 
@@ -164,7 +164,7 @@ void PaintSelection(MainWindow* win, HDC hdc) {
             }
         }
 
-        CrashIf(!win->CurrentTab()->selectionOnPage);
+        ReportIf(!win->CurrentTab()->selectionOnPage);
         if (!win->CurrentTab()->selectionOnPage) {
             return;
         }
@@ -212,7 +212,7 @@ TempStr GetSelectedTextTemp(WindowTab* tab, const char* lineSep, bool& isTextOnl
         return nullptr;
     }
     DisplayModel* dm = tab->AsFixed();
-    CrashIf(!dm);
+    ReportIf(!dm);
     if (!dm) {
         return nullptr;
     }
@@ -244,7 +244,7 @@ TempStr GetSelectedTextTemp(WindowTab* tab, const char* lineSep, bool& isTextOnl
 
 void CopySelectionToClipboard(MainWindow* win) {
     WindowTab* tab = win->CurrentTab();
-    CrashIf(tab->selectionOnPage->size() == 0 && win->mouseAction != MouseAction::SelectingText);
+    ReportIf(tab->selectionOnPage->size() == 0 && win->mouseAction != MouseAction::SelectingText);
 
     if (!OpenClipboard(nullptr)) {
         return;
@@ -353,9 +353,9 @@ void OnSelectionEdgeAutoscroll(MainWindow* win, int x, int y) {
         dy = SELECT_AUTOSCROLL_STEP_LENGTH;
     }
 
-    CrashIf(NeedsSelectionEdgeAutoscroll(win, x, y) != (dx != 0 || dy != 0));
+    ReportIf(NeedsSelectionEdgeAutoscroll(win, x, y) != (dx != 0 || dy != 0));
     if (dx != 0 || dy != 0) {
-        CrashIf(!win->AsFixed());
+        ReportIf(!win->AsFixed());
         DisplayModel* dm = win->AsFixed();
         Point oldOffset = dm->GetViewPort().TL();
         win->MoveDocBy(dx, dy);
@@ -370,7 +370,7 @@ void OnSelectionEdgeAutoscroll(MainWindow* win, int x, int y) {
 }
 
 void OnSelectionStart(MainWindow* win, int x, int y, WPARAM) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     DeleteOldSelectionInfo(win, true);
 
     win->selectionRect = Rect(x, y, 0, 0);
diff --git a/src/StressTesting.cpp b/src/StressTesting.cpp
index 1c9b138bef5..6c358c4bc47 100644
--- a/src/StressTesting.cpp
+++ b/src/StressTesting.cpp
@@ -146,7 +146,7 @@ static void BenchFile(const char* path, const char* pagesSpec) {
         }
     }
 
-    CrashIf(pagesSpec && !IsBenchPagesInfo(pagesSpec));
+    ReportIf(pagesSpec && !IsBenchPagesInfo(pagesSpec));
     Vec<PageRange> ranges;
     if (ParsePageRanges(pagesSpec, ranges)) {
         for (size_t i = 0; i < ranges.size(); i++) {
@@ -384,10 +384,10 @@ TempStr DirFileProviderAsync::NextFile() {
             path = q->strings.RemoveAtFast(idx);
         });
         if (isFinished) {
-            CrashIf(path);
+            ReportIf(path);
             return nullptr;
         }
-        CrashIf(!path);
+        ReportIf(!path);
         if (!IsStressTestSupportedFile(path, fileFilter.Get())) {
             goto again;
         }
@@ -438,7 +438,7 @@ struct StressTest {
 template <typename T>
 T RemoveRandomElementFromVec(Vec<T>& v) {
     auto n = v.Size();
-    CrashIf(n <= 0);
+    ReportIf(n <= 0);
     int idx = rand() % n;
     int res = v.PopAt((size_t)idx);
     return res;
@@ -543,7 +543,7 @@ static bool OpenFile(StressTest* st, const char* fileName) {
 #if 0
     // transfer ownership of stressTest object to a new window and close the
     // current one
-    CrashIf(st != st->win->stressTest);
+    ReportIf(st != st->win->stressTest);
     if (w != st->win) {
         if (st->win->IsDocLoaded()) {
             // try to provoke a crash in RenderCache cleanup code
@@ -782,7 +782,7 @@ static void OnTimer(StressTest* st, int timerIdGot) {
     DisplayModel* dm;
     bool didRender;
 
-    CrashIf(st->timerId != timerIdGot);
+    ReportIf(st->timerId != timerIdGot);
     KillTimer(st->win->hwndFrame, st->timerId);
     if (!st->win->IsDocLoaded()) {
         if (!GoToNextFile(st)) {
diff --git a/src/SumatraDialogs.cpp b/src/SumatraDialogs.cpp
index eedca5c1b66..e19f7f41cb8 100644
--- a/src/SumatraDialogs.cpp
+++ b/src/SumatraDialogs.cpp
@@ -42,12 +42,12 @@ struct DLGTEMPLATEEX {
 
 DLGTEMPLATE* DupTemplate(int dlgId) {
     HRSRC dialogRC = FindResourceW(nullptr, MAKEINTRESOURCE(dlgId), RT_DIALOG);
-    CrashIf(!dialogRC);
+    ReportIf(!dialogRC);
     HGLOBAL dlgTemplate = LoadResource(nullptr, dialogRC);
-    CrashIf(!dlgTemplate);
+    ReportIf(!dlgTemplate);
     void* orig = LockResource(dlgTemplate);
     size_t size = SizeofResource(nullptr, dialogRC);
-    CrashIf(size == 0);
+    ReportIf(size == 0);
     DLGTEMPLATE* ret = (DLGTEMPLATE*)memdup(orig, size);
     UnlockResource(orig);
     return ret;
@@ -119,12 +119,12 @@ static int ToFontPointSize(int fontSize) {
 // TODO: if changing font name would have do more complicated dance of replacing
 // variable string in the middle of the struct
 static void SetDlgTemplateExFont(DLGTEMPLATE* tmp, bool isRtl, int fontSize) {
-    CrashIf(!IsDlgTemplateEx(tmp));
+    ReportIf(!IsDlgTemplateEx(tmp));
     if (isRtl) {
         SetDlgTemplateRtl(tmp);
     }
     DLGTEMPLATEEX* tpl = (DLGTEMPLATEEX*)tmp;
-    CrashIf(!HasDlgTemplateExFont(tpl));
+    ReportIf(!HasDlgTemplateExFont(tpl));
     u8* d = (u8*)tpl;
     d += sizeof(DLGTEMPLATEEX);
     // sz_Or_Ord menu
@@ -266,7 +266,7 @@ static INT_PTR CALLBACK Dialog_GoToPage_Proc(HWND hDlg, UINT msg, WPARAM wp, LPA
         if (!data->onlyNumeric) {
             SetWindowLong(editPageNo, GWL_STYLE, GetWindowLong(editPageNo, GWL_STYLE) & ~ES_NUMBER);
         }
-        CrashIf(!data->currPageLabel);
+        ReportIf(!data->currPageLabel);
         HwndSetDlgItemText(hDlg, IDC_GOTO_PAGE_EDIT, data->currPageLabel);
         TempStr totalCount = str::FormatTemp(_TRA("(of %d)"), data->pageCount);
         HwndSetDlgItemText(hDlg, IDC_GOTO_PAGE_LABEL_OF, totalCount);
@@ -506,9 +506,9 @@ static INT_PTR CALLBACK Dialog_ChangeLanguage_Proc(HWND hDlg, UINT msg, WPARAM w
         case WM_COMMAND:
             data = (Dialog_ChangeLanguage_Data*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
             if (HIWORD(wp) == LBN_DBLCLK) {
-                CrashIf(IDC_CHANGE_LANG_LANG_LIST != LOWORD(wp));
+                ReportIf(IDC_CHANGE_LANG_LANG_LIST != LOWORD(wp));
                 langList = GetDlgItem(hDlg, IDC_CHANGE_LANG_LANG_LIST);
-                CrashIf(langList != (HWND)lp);
+                ReportIf(langList != (HWND)lp);
                 int langIdx = (int)ListBox_GetCurSel(langList);
                 data->langCode = trans::GetLangCodeByIdx(langIdx);
                 EndDialog(hDlg, IDOK);
diff --git a/src/SumatraPDF.cpp b/src/SumatraPDF.cpp
index 1980386695a..ca36df869a2 100644
--- a/src/SumatraPDF.cpp
+++ b/src/SumatraPDF.cpp
@@ -188,8 +188,8 @@ void SetCurrentLang(const char* langCode) {
 
 void InitializePolicies(bool restrict) {
     // default configuration should be to restrict everything
-    CrashIf(gPolicyRestrictions != Perm::RestrictedUse);
-    CrashIf(gAllowedLinkProtocols.Size() != 0 || gAllowedFileTypes.Size() != 0);
+    ReportIf(gPolicyRestrictions != Perm::RestrictedUse);
+    ReportIf(gAllowedLinkProtocols.Size() != 0 || gAllowedFileTypes.Size() != 0);
 
     // the -restrict command line flag overrides any sumatrapdfrestrict.ini configuration
     if (restrict) {
@@ -265,7 +265,7 @@ bool HasPermission(Perm permission) {
 bool SumatraLaunchBrowser(const char* url) {
     if (gPluginMode) {
         // pass the URI back to the browser
-        CrashIf(gWindows.empty());
+        ReportIf(gWindows.empty());
         if (gWindows.empty()) {
             return false;
         }
@@ -481,7 +481,7 @@ char* HwndPasswordUI::GetPassword(const char* path, u8* fileDigest, u8 decryptio
 
     // check if the window is still valid as it might have been closed by now
     if (!IsWindow(hwnd)) {
-        CrashIf(true);
+        ReportIf(true);
         hwnd = GetForegroundWindow();
     }
     // make sure that the password dialog is visible
@@ -530,7 +530,7 @@ static void UpdateDisplayStateWindowRect(MainWindow* win, FileState* fs, bool up
 }
 
 static void UpdateSidebarDisplayState(WindowTab* tab, FileState* fs) {
-    CrashIf(!tab);
+    ReportIf(!tab);
     MainWindow* win = tab->win;
     fs->showToc = tab->showToc;
     if (win->tocLoaded && tab == win->CurrentTab()) {
@@ -733,7 +733,7 @@ static void CreateThumbnailForFile(MainWindow* win, FileState* ds) {
         return;
     }
 
-    CrashIf(!win->IsDocLoaded());
+    ReportIf(!win->IsDocLoaded());
     if (!win->IsDocLoaded()) {
         return;
     }
@@ -764,7 +764,7 @@ static void CreateThumbnailForFile(MainWindow* win, FileState* ds) {
 
 /* Send the request to render a given page to a rendering thread */
 void ControllerCallbackHandler::RequestRendering(int pageNo) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     if (!win->AsFixed()) {
         return;
     }
@@ -796,7 +796,7 @@ void ControllerCallbackHandler::SaveDownload(const char* url, const ByteSlice& d
 }
 
 void ControllerCallbackHandler::UpdateScrollbars(Size canvas) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     DisplayModel* dm = win->AsFixed();
 
     SCROLLINFO si{};
@@ -907,7 +907,7 @@ void ControllerCallbackHandler::PageNoChanged(DocController* ctrl, int pageNo) {
         return;
     }
 
-    CrashIf(!win->ctrl || win->ctrl->PageCount() <= 0);
+    ReportIf(!win->ctrl || win->ctrl->PageCount() <= 0);
     if (!win->ctrl || win->ctrl->PageCount() == 0) {
         return;
     }
@@ -931,7 +931,7 @@ void ControllerCallbackHandler::PageNoChanged(DocController* ctrl, int pageNo) {
     if (!wnd) {
         return;
     }
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     UpdatePageInfoHelper(win->ctrl, wnd, pageNo);
 }
 
@@ -947,7 +947,7 @@ static NO_INLINE void VerifyController(DocController* ctrl, const char* path) {
     const char* s1 = ctrlFilePath ? ctrlFilePath : "<null>";
     const char* s2 = path ? path : "<null>";
     logf("VerifyController: ctrl->FilePath: '%s', filePath: '%s'\n", s1, s2);
-    CrashIf(true);
+    ReportIf(true);
 }
 
 static DocController* CreateControllerForChm(const char* path, PasswordUI* pwdUI, MainWindow* win) {
@@ -975,16 +975,16 @@ static DocController* CreateControllerForChm(const char* path, PasswordUI* pwdUI
         if (!engine) {
             return nullptr;
         }
-        CrashIf(engine->kind != kindEngineChm);
+        ReportIf(engine->kind != kindEngineChm);
         ctrl = new DisplayModel(engine, win->cbHandler);
-        CrashIf(!ctrl || !ctrl->AsFixed() || ctrl->AsChm());
+        ReportIf(!ctrl || !ctrl->AsFixed() || ctrl->AsChm());
     } else {
         // another ChmModel might still be active
         chmModel->RemoveParentHwnd();
         ctrl = chmModel;
-        CrashIf(!ctrl->AsChm() || ctrl->AsFixed());
+        ReportIf(!ctrl->AsChm() || ctrl->AsFixed());
     }
-    CrashIf(!ctrl);
+    ReportIf(!ctrl);
     VerifyController(ctrl, path);
     return ctrl;
 }
@@ -1022,7 +1022,7 @@ DocController* CreateControllerForEngineOrFile(EngineBase* engine, const char* p
         return nullptr;
     }
     DocController* ctrl = new DisplayModel(engine, win->cbHandler);
-    CrashIf(!ctrl || !ctrl->AsFixed() || ctrl->AsChm());
+    ReportIf(!ctrl || !ctrl->AsFixed() || ctrl->AsChm());
     VerifyController(ctrl, path);
     gMostRecentlyOpenedDoc = ctrl;
     return ctrl;
@@ -1110,12 +1110,12 @@ static bool showTocByDefault(const char* path) {
 //   before (isNewWindow=false)
 static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, FileState* fs) {
     MainWindow* win = args->win;
-    CrashIf(!win);
+    ReportIf(!win);
     if (!win) {
         return;
     }
     WindowTab* tab = win->CurrentTab();
-    CrashIf(!tab);
+    ReportIf(!tab);
 
     // Never load settings from a preexisting state if the user doesn't wish to
     // (unless we're just refreshing the document, i.e. only if state && !state->useDefaultState)
@@ -1175,7 +1175,7 @@ static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, Fil
     ClearMouseState(win);
 
     // TODO: this crashes with new tabs
-    // CrashIf(win->IsAboutWindow() || win->IsDocLoaded() != (win->ctrl != nullptr));
+    // ReportIf(win->IsAboutWindow() || win->IsDocLoaded() != (win->ctrl != nullptr));
     // TODO: https://code.google.com/p/sumatrapdf/issues/detail?id=1570
     if (win->ctrl) {
         DisplayModel* dm = win->AsFixed();
@@ -1204,7 +1204,7 @@ static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, Fil
             ss.page = limitValue(ss.page, 1, win->ctrl->PageCount());
             win->ctrl->GoToPage(ss.page, false);
         } else {
-            CrashIf(true);
+            ReportIf(true);
         }
     } else {
         fs = nullptr;
@@ -1212,7 +1212,7 @@ static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, Fil
     delete prevCtrl;
 
     if (fs) {
-        CrashIf(!win->IsDocLoaded());
+        ReportIf(!win->IsDocLoaded());
         zoomVirtual = ZoomFromString(fs->zoom, kZoomFitPage);
         if (win->ctrl->ValidPageNo(ss.page)) {
             if (kZoomFitContent != zoomVirtual) {
@@ -1245,7 +1245,7 @@ static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, Fil
     UpdateUiForCurrentTab(win);
 
     if (HasPermission(Perm::DiskAccess) && tab->GetEngineType() == kindEngineMupdf) {
-        CrashIf(!win->AsFixed() || win->AsFixed()->pdfSync);
+        ReportIf(!win->AsFixed() || win->AsFixed()->pdfSync);
         path = args->FilePath();
         int res = Synchronizer::Create(path, win->AsFixed()->GetEngine(), &win->AsFixed()->pdfSync);
         // expose SyncTeX in the UI
@@ -1277,7 +1277,7 @@ static void ReplaceDocumentInCurrentTab(LoadArgs* args, DocController* ctrl, Fil
     // if the window isn't shown and win.canvasRc is still empty, zoom
     // has not been determined yet
     // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2541
-    // CrashIf(win->IsDocLoaded() && args->showWin && win->canvasRc.IsEmpty() && !win->AsChm());
+    // ReportIf(win->IsDocLoaded() && args->showWin && win->canvasRc.IsEmpty() && !win->AsChm());
 
     SetSidebarVisibility(win, showToc, gGlobalPrefs->showFavorites);
     // restore scroll state after the canvas size has been restored
@@ -1481,7 +1481,7 @@ static MainWindow* CreateMainWindow() {
         return nullptr;
     }
 
-    CrashIf(nullptr != FindMainWindowByHwnd(hwndFrame));
+    ReportIf(nullptr != FindMainWindowByHwnd(hwndFrame));
     MainWindow* win = new MainWindow(hwndFrame);
 
     // don't add a WS_EX_STATICEDGE so that the scrollbars touch the
@@ -1506,7 +1506,7 @@ static MainWindow* CreateMainWindow() {
     // hide scrollbars to avoid showing/hiding on empty window
     ShowScrollBar(win->hwndCanvas, SB_BOTH, FALSE);
 
-    CrashIf(win->menu);
+    ReportIf(win->menu);
     win->menu = BuildMenu(win);
     win->isMenuHidden = !gGlobalPrefs->showMenubar;
     if (!win->isMenuHidden) {
@@ -1555,7 +1555,7 @@ MainWindow* CreateAndShowMainWindow(SessionData* data) {
         return nullptr;
     }
     // CreateMainWindow shouldn't change the windowState value
-    CrashIf(windowState != gGlobalPrefs->windowState);
+    ReportIf(windowState != gGlobalPrefs->windowState);
 
     if (data) {
         windowState = data->windowState;
@@ -1589,8 +1589,8 @@ void DeleteMainWindow(MainWindow* win) {
     ImageList_Destroy((HIMAGELIST)SendMessageW(win->hwndToolbar, TB_GETIMAGELIST, 0, 0));
     DragAcceptFiles(win->hwndCanvas, FALSE);
 
-    CrashIf(win->findThread && WaitForSingleObject(win->findThread, 0) == WAIT_TIMEOUT);
-    CrashIf(win->printThread && WaitForSingleObject(win->printThread, 0) == WAIT_TIMEOUT);
+    ReportIf(win->findThread && WaitForSingleObject(win->findThread, 0) == WAIT_TIMEOUT);
+    ReportIf(win->printThread && WaitForSingleObject(win->printThread, 0) == WAIT_TIMEOUT);
 
     if (win->uiaProvider) {
         // tell UIA to release all objects cached in its store
@@ -1751,7 +1751,7 @@ MainWindow* LoadDocumentFinish(LoadArgs* args) {
     const char* fullPath = args->FilePath();
 
     bool openNewTab = gGlobalPrefs->useTabs && !args->forceReuse;
-    CrashIf(openNewTab && args->forceReuse);
+    ReportIf(openNewTab && args->forceReuse);
 
     if (win->IsCurrentTabAbout()) {
         // TODO: probably need to do it when switching tabs
@@ -1831,7 +1831,7 @@ MainWindow* LoadDocumentFinish(LoadArgs* args) {
     }
 
     if (gGlobalPrefs->rememberOpenedFiles) {
-        CrashIf(!str::Eq(fullPath, path));
+        ReportIf(!str::Eq(fullPath, path));
         FileState* ds = gFileHistory.MarkFileLoaded(fullPath);
         if (!lazyLoad && gGlobalPrefs->showStartPage) {
             CreateThumbnailForFile(win, ds);
@@ -1894,6 +1894,11 @@ static MainWindow* MaybeCreateWindowForFileLoad(LoadArgs* args) {
 }
 
 void LoadDocumentAsync(LoadArgs* argsIn) {
+    if (gCrashOnOpen) {
+        log("LoadDocumentAsync: about to call CrashMe()\n");
+        CrashMe();
+    }
+
     MainWindow* win = argsIn->win;
     bool failEarly = AdjustPathForMaybeMovedFile(argsIn);
     const char* path = argsIn->FilePath();
@@ -2152,7 +2157,7 @@ static TempStr FormatCursorPositionTemp(EngineBase* engine, PointF pt, Measureme
 
 static auto cursorPosUnit = MeasurementUnit::pt;
 void UpdateCursorPositionHelper(MainWindow* win, Point pos, NotificationWnd* wnd) {
-    CrashIf(!win->AsFixed());
+    ReportIf(!win->AsFixed());
     EngineBase* engine = win->AsFixed()->GetEngine();
     PointF pt = win->AsFixed()->CvtFromScreen(pos);
     char* posStr = FormatCursorPositionTemp(engine, pt, cursorPosUnit);
@@ -2330,7 +2335,7 @@ static void CloseDocumentInCurrentTab(MainWindow* win, bool keepUIEnabled, bool
         ShowScrollBar(win->hwndCanvas, SB_BOTH, FALSE);
         win->RedrawAll();
         HwndSetText(win->hwndFrame, kSumatraWindowTitle);
-        CrashIf(win->TabCount() != 0 || win->CurrentTab());
+        ReportIf(win->TabCount() != 0 || win->CurrentTab());
     }
 
     // Note: this causes https://code.google.com/p/sumatrapdf/issues/detail?id=2702. For whatever reason
@@ -2522,7 +2527,7 @@ SaveChoice ShouldSaveAnnotationsDialog(HWND hwndParent, const char* filePath) {
     int buttonPressedId = 0;
 
     auto hr = TaskDialogIndirect(&dialogConfig, &buttonPressedId, nullptr, nullptr);
-    CrashIf(hr == E_INVALIDARG);
+    ReportIf(hr == E_INVALIDARG);
     bool discard = (hr != S_OK) || (buttonPressedId == kBtnIdDiscard);
     if (discard) {
         return SaveChoice::Discard;
@@ -2589,7 +2594,7 @@ static bool MaybeSaveAnnotations(WindowTab* tab) {
             tab->askedToSaveAnnotations = false;
             return false;
         default:
-            CrashIf(true);
+            ReportIf(true);
     }
     return true;
 }
@@ -2620,7 +2625,7 @@ void CloseTab(WindowTab* tab, bool quitIfLast) {
             return;
         }
     } else {
-        CrashIf(gPluginMode && !gWindows.Contains(win));
+        ReportIf(gPluginMode && !gWindows.Contains(win));
         RemoveTab(tab);
         delete tab;
     }
@@ -2684,7 +2689,7 @@ void CloseWindow(MainWindow* win, bool quitIfLast, bool forceClose) {
         return;
     }
 
-    CrashIf(forceClose && !quitIfLast);
+    ReportIf(forceClose && !quitIfLast);
     if (forceClose) {
         quitIfLast = true;
     }
@@ -2747,7 +2752,7 @@ void CloseWindow(MainWindow* win, bool quitIfLast, bool forceClose) {
         /* last window - don't delete it */
         CloseDocumentInCurrentTab(win, false, false);
         SetFocus(win->hwndFrame);
-        CrashIf(!gWindows.Contains(win));
+        ReportIf(!gWindows.Contains(win));
     } else {
         FreeMenuOwnerDrawInfoData(win->menu);
         HWND hwndToDestroy = win->hwndFrame;
@@ -2757,7 +2762,7 @@ void CloseWindow(MainWindow* win, bool quitIfLast, bool forceClose) {
 
     if (lastWindow && quitIfLast) {
         logf("Calling PostQuitMessage() in CloseWindow() because closing lastWindow\n");
-        CrashIf(gWindows.size() != 0);
+        ReportIf(gWindows.size() != 0);
         PostQuitMessage(0);
     }
 }
@@ -2823,7 +2828,7 @@ static void SaveCurrentFileAs(MainWindow* win) {
         }
     }
 
-    CrashIf(!srcFileName);
+    ReportIf(!srcFileName);
     if (!srcFileName) {
         return;
     }
@@ -2997,7 +3002,7 @@ static void RenameCurrentFile(MainWindow* win) {
     TempWStr defExtW = ToWStrTemp(defExt);
     str::Str fileFilter(256);
     bool ok = AppendFileFilterForDoc(ctrl, fileFilter);
-    CrashIf(!ok);
+    ReportIf(!ok);
     fileFilter.AppendFmt("\1*%s\1", defExt);
     str::TransCharsInPlace(fileFilter.Get(), "\1", "\0");
 
@@ -3297,7 +3302,7 @@ static TempWStr GetFileFilterTemp() {
             fileFilter.AppendChar(';');
         }
     }
-    CrashIf(fileFilter.Last() != ';');
+    ReportIf(fileFilter.Last() != ';');
     fileFilter.Last() = '\1';
     for (int i = 0; i < dimof(fileFormats); i++) {
         if (fileFormats[i].available && fileFormats[i].name) {
@@ -3410,7 +3415,7 @@ static StrVec& CollectNextPrevFilesIfChanged(const char* path) {
 }
 
 static void OpenNextPrevFileInFolder(MainWindow* win, bool forward) {
-    CrashIf(win->IsCurrentTabAbout());
+    ReportIf(win->IsCurrentTabAbout());
     if (win->IsCurrentTabAbout()) {
         return;
     }
@@ -3939,9 +3944,9 @@ void EnterFullScreen(MainWindow* win, bool presentation) {
         return;
     }
 
-    CrashIf(presentation ? win->isFullScreen : win->presentation);
+    ReportIf(presentation ? win->isFullScreen : win->presentation);
     if (presentation) {
-        CrashIf(!win->ctrl);
+        ReportIf(!win->ctrl);
         if (!win->IsDocLoaded()) {
             return;
         }
@@ -4038,8 +4043,8 @@ void ExitFullScreen(MainWindow* win) {
     uint flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE;
     SetWindowPos(win->hwndFrame, nullptr, 0, 0, 0, 0, flags);
     MoveWindow(win->hwndFrame, win->nonFullScreenFrameRect);
-    // TODO: this CrashIf() fires in pre-release e.g. 64011
-    // CrashIf(WindowRect(win.hwndFrame) != win.nonFullScreenFrameRect);
+    // TODO: this ReportIf() fires in pre-release e.g. 64011
+    // ReportIf(WindowRect(win.hwndFrame) != win.nonFullScreenFrameRect);
     // We have to relayout here, because it isn't done in the SetWindowPos nor MoveWindow,
     // if the client rectangle hasn't changed.
     if (ClientRect(win->hwndFrame) == cr) {
@@ -4096,7 +4101,7 @@ void AdvanceFocus(MainWindow* win) {
     if (gGlobalPrefs->showFavorites) {
         tabOrder[nWindows++] = win->favTreeView->hwnd;
     }
-    CrashIf(nWindows > MAX_WINDOWS);
+    ReportIf(nWindows > MAX_WINDOWS);
 
     // find the currently focused element
     HWND focused = GetFocus();
@@ -4543,7 +4548,7 @@ static void OnFavSplitterMove(SplitterMoveEvent* ev) {
     // make sure to keep this in sync with the calculations in RelayoutFrame
     Rect rFrame = ClientRect(win->hwndFrame);
     Rect rToc = ClientRect(win->hwndTocBox);
-    CrashIf(rToc.dx != ClientRect(win->hwndFavBox).dx);
+    ReportIf(rToc.dx != ClientRect(win->hwndFavBox).dx);
     int minDy = std::min(kTocMinDy, rToc.dy);
     int maxDy = std::max(rFrame.dy - kTocMinDy, rToc.dy);
     if (tocDy < minDy || tocDy > maxDy) {
@@ -4570,7 +4575,7 @@ void SetSidebarVisibility(MainWindow* win, bool tocVisible, bool showFavorites)
 
     if (tocVisible) {
         LoadTocTree(win);
-        CrashIf(!win->tocLoaded);
+        ReportIf(!win->tocLoaded);
     }
 
     if (showFavorites) {
@@ -4578,7 +4583,7 @@ void SetSidebarVisibility(MainWindow* win, bool tocVisible, bool showFavorites)
     }
 
     if (!win->CurrentTab()) {
-        CrashIf(tocVisible);
+        ReportIf(tocVisible);
     } else if (!win->presentation) {
         win->CurrentTab()->showToc = tocVisible;
     } else if (PM_ENABLED == win->presentation) {
@@ -4975,7 +4980,7 @@ static bool ExtractFiles(lzma::SimpleArchive* archive, const char* destDir) {
 }
 
 static bool MaybeDeleteStaleDirectory(WIN32_FIND_DATAW* fd, const char* dir) {
-    CrashIf(!IsDirectory(fd->dwFileAttributes));
+    ReportIf(!IsDirectory(fd->dwFileAttributes));
     TempStr name = ToUtf8Temp(fd->cFileName);
     bool maybeDelete = str::StartsWith(name, "manual-") || str::StartsWith(name, "crashinfo-");
     if (!maybeDelete) {
@@ -6073,7 +6078,7 @@ LRESULT CALLBACK WndProcSumatraFrame(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
             if (win->AsChm()) {
                 return win->AsChm()->PassUIMsg(msg, wp, lp);
             }
-            CrashIf(!win->AsFixed());
+            ReportIf(!win->AsFixed());
             // Pass the message to the canvas' window procedure
             // (required since the canvas itself never has the focus and thus
             // never receives WM_MOUSEWHEEL messages)
diff --git a/src/SumatraProperties.cpp b/src/SumatraProperties.cpp
index d0fcb57e453..ae19c0cf573 100644
--- a/src/SumatraProperties.cpp
+++ b/src/SumatraProperties.cpp
@@ -322,7 +322,7 @@ static Rect CalcPropertiesLayout(PropertiesLayout* layoutData, HDC hdc) {
         lineCount++;
     }
 
-    CrashIf(!(lineCount > 0 && textDy > 0));
+    ReportIf(!(lineCount > 0 && textDy > 0));
     int totalDx = leftMaxDx + kLeftRightPaddingDx + rightMaxDx;
 
     int totalDy = 4;
@@ -403,13 +403,13 @@ static bool CreatePropertiesWindow(HWND hParent, PropertiesLayout* layoutData, b
         FillWndClassEx(wcex, kPropertiesWinClassName, WndProcProperties);
         WCHAR* iconName = MAKEINTRESOURCEW(GetAppIconID());
         wcex.hIcon = LoadIconW(h, iconName);
-        CrashIf(!wcex.hIcon);
+        ReportIf(!wcex.hIcon);
         ATOM atom = RegisterClassEx(&wcex);
-        CrashIf(!atom);
+        ReportIf(!atom);
         gDidRegister = true;
     }
 
-    CrashIf(layoutData->hwnd);
+    ReportIf(layoutData->hwnd);
     DWORD dwStyle = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU;
     auto clsName = kPropertiesWinClassName;
     auto title = ToWStrTemp(_TRA("Document Properties"));
@@ -487,7 +487,7 @@ static const char* propToName[] = {
 
 static void AddPropTranslated(PropertiesLayout* layoutData, const char* propName, const char* val) {
     const char* s = GetMatchingString(propToName, propName);
-    CrashIf(!s);
+    ReportIf(!s);
     const char* trans = trans::GetTranslation(s);
     layoutData->AddProperty(trans, val);
 }
@@ -535,7 +535,7 @@ static void AddPdfFileStructure(DocController* ctrl, PropertiesLayout* layoutDat
 }
 
 static void GetProps(DocController* ctrl, PropertiesLayout* layoutData, bool extended) {
-    CrashIf(!ctrl);
+    ReportIf(!ctrl);
 
     const char* path = gPluginMode ? gPluginURL : ctrl->GetFilePath();
     layoutData->AddProperty(_TRA("File:"), path, true);
@@ -725,7 +725,7 @@ LRESULT CALLBACK WndProcProperties(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) {
 
         case WM_DESTROY:
             pl = FindPropertyWindowByHwnd(hwnd);
-            CrashIf(!pl);
+            ReportIf(!pl);
             gPropertiesWindows.Remove(pl);
             delete pl;
             break;
diff --git a/src/SumatraStartup.cpp b/src/SumatraStartup.cpp
index 3e075b4d289..c0017c0d05e 100644
--- a/src/SumatraStartup.cpp
+++ b/src/SumatraStartup.cpp
@@ -131,7 +131,7 @@ void FileExistenceChecker::Run() {
     }
 
     uitask::Post(TaskHideMissingFiles, [=] {
-        CrashIf(WasCancelRequested());
+        ReportIf(WasCancelRequested());
         HideMissingFiles();
 
         gFileExistenceChecker = nullptr;
@@ -147,7 +147,7 @@ static NO_INLINE bool MaybeMakePluginWindow(MainWindow* win, HWND hwndParent) {
     }
     logfa("MakePluginWindow: win: 0x%p, hwndParent: 0x%x (isWindow: %d), gPluginURL: %s\n", win, hwndParent,
           (int)IsWindow(hwndParent), gPluginURL ? gPluginURL : "<nulL>");
-    CrashIf(!gPluginMode);
+    ReportIf(!gPluginMode);
 
     if (!IsWindow(hwndParent)) {
         // we validated hwndParent for validity at startup but I'm seeing cases
@@ -180,16 +180,16 @@ static bool RegisterWinClass() {
     WCHAR* iconName = MAKEINTRESOURCEW(GetAppIconID());
     FillWndClassEx(wcex, FRAME_CLASS_NAME, WndProcSumatraFrame);
     wcex.hIcon = LoadIconW(h, iconName);
-    CrashIf(!wcex.hIcon);
+    ReportIf(!wcex.hIcon);
     // For the extended translucent frame to be visible, we need black background.
     wcex.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
     atom = RegisterClassEx(&wcex);
-    CrashIf(!atom);
+    ReportIf(!atom);
 
     FillWndClassEx(wcex, CANVAS_CLASS_NAME, WndProcCanvas);
     wcex.style |= CS_DBLCLKS;
     atom = RegisterClassEx(&wcex);
-    CrashIf(!atom);
+    ReportIf(!atom);
 
     RegisterCaptionWndClass();
     return true;
@@ -197,10 +197,10 @@ static bool RegisterWinClass() {
 
 static bool InstanceInit() {
     gCursorDrag = LoadCursor(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDC_CURSORDRAG));
-    CrashIf(!gCursorDrag);
+    ReportIf(!gCursorDrag);
 
     gBitmapReloadingCue = LoadBitmap(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDB_RELOADING_CUE));
-    CrashIf(!gBitmapReloadingCue);
+    ReportIf(!gBitmapReloadingCue);
     return true;
 }
 
@@ -810,7 +810,7 @@ Learn more at https://www.sumatrapdfreader.org/docs/Corrupted-installation
     dialogConfig.pszMainIcon = TD_ERROR_ICON;
 
     auto hr = TaskDialogIndirect(&dialogConfig, nullptr, nullptr, nullptr);
-    CrashIf(hr == E_INVALIDARG);
+    ReportIf(hr == E_INVALIDARG);
     HandleRedirectedConsoleOnShutdown();
     ::ExitProcess(1);
 }
@@ -863,7 +863,7 @@ static void ShowInstallerHelp() {
     dialogConfig.pszMainIcon = TD_INFORMATION_ICON;
 
     auto hr = TaskDialogIndirect(&dialogConfig, nullptr, nullptr, nullptr);
-    CrashIf(hr == E_INVALIDARG);
+    ReportIf(hr == E_INVALIDARG);
 }
 
 // in Installer.cpp
@@ -912,7 +912,7 @@ static void ShowNoAdminErrorMessage() {
     dialogConfig.pszMainIcon = TD_INFORMATION_ICON;
 
     auto hr = TaskDialogIndirect(&dialogConfig, nullptr, nullptr, nullptr);
-    CrashIf(hr == E_INVALIDARG);
+    ReportIf(hr == E_INVALIDARG);
 }
 
 // non-admin process cannot send DDE messages to admin process
@@ -978,7 +978,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) {
     const char* logFilePath = nullptr;
     Vec<SessionData*>* sessionData = nullptr;
 
-    CrashIf(hInstance != GetInstance());
+    ReportIf(hInstance != GetInstance());
 
     supressThrowFromNew();
 
@@ -1194,7 +1194,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) {
         goto Exit;
     }
 
-    CrashIf(hInstance != GetModuleHandle(nullptr));
+    ReportIf(hInstance != GetModuleHandle(nullptr));
     if (!InstanceInit()) {
         goto Exit;
     }
diff --git a/src/SvgIcons.cpp b/src/SvgIcons.cpp
index 6c0cb1e240d..b88313f25e3 100644
--- a/src/SvgIcons.cpp
+++ b/src/SvgIcons.cpp
@@ -152,7 +152,7 @@ static const char* gIcons[] = {
 
 const char* GetSvgIcon(TbIcon idx) {
     int n = (int)idx;
-    CrashIf(n < 0 || n >= dimofi(gIcons));
+    ReportIf(n < 0 || n >= dimofi(gIcons));
     if (n >= dimofi(gIcons)) {
         return nullptr;
     }
diff --git a/src/TableOfContents.cpp b/src/TableOfContents.cpp
index 0f8e02c8179..965897999b6 100644
--- a/src/TableOfContents.cpp
+++ b/src/TableOfContents.cpp
@@ -80,7 +80,7 @@ static void TocCustomizeTooltip(TreeItemGetTooltipEvent* ev) {
     bool isOk = (k == kindDestinationLaunchURL) || (k == kindDestinationLaunchFile) ||
                 (k == kindDestinationLaunchEmbedded) || (k == kindDestinationMupdf) || (k = kindDestinationDjVu) ||
                 (k == kindDestinationAttachment);
-    CrashIf(!isOk);
+    ReportIf(!isOk);
 
     str::Str infotip;
 
@@ -445,7 +445,7 @@ static void OpenAttachment(WindowTab* tab, const char* fileName, int attachmentN
 }
 
 static void OpenEmbeddedFile(WindowTab* tab, IPageDestination* dest) {
-    CrashIf(!tab || !dest);
+    ReportIf(!tab || !dest);
     if (!tab || !dest) {
         return;
     }
@@ -686,7 +686,7 @@ static void AutoExpandTopLevelItems(TocItem* root) {
 
 void LoadTocTree(MainWindow* win) {
     WindowTab* tab = win->CurrentTab();
-    CrashIf(!tab);
+    ReportIf(!tab);
 
     if (win->tocLoaded) {
         return;
@@ -795,7 +795,7 @@ LRESULT TocTreeClick(TreeClickEvent* ev) {
         return;
     }
     MainWindow* win = FindMainWindowByHwnd(ev->w->hwnd);
-    CrashIf(!win);
+    ReportIf(!win);
     bool allowExternal = false;
     GoToTocTreeItem(win, ev->treeItem, allowExternal);
 #endif
@@ -804,7 +804,7 @@ LRESULT TocTreeClick(TreeClickEvent* ev) {
 
 static void TocTreeSelectionChanged(TreeSelectionChangedEvent* ev) {
     MainWindow* win = FindMainWindowByHwnd(ev->treeView->hwnd);
-    CrashIf(!win);
+    ReportIf(!win);
 
     // When the focus is set to the toc window the first item in the treeview is automatically
     // selected and a TVN_SELCHANGEDW notification message is sent with the special code pnmtv->action ==
@@ -913,7 +913,7 @@ static void SubclassToc(MainWindow* win) {
     if (win->tocBoxSubclassId == 0) {
         win->tocBoxSubclassId = NextSubclassId();
         BOOL ok = SetWindowSubclass(hwndTocBox, WndProcTocBox, win->tocBoxSubclassId, (DWORD_PTR)win);
-        CrashIf(!ok);
+        ReportIf(!ok);
     }
 }
 
@@ -928,7 +928,7 @@ void UnsubclassToc(MainWindow* win) {
 #if 0
 void TocTreeMouseWheelHandler(MouseWheelEvent* ev) {
     MainWindow* win = FindMainWindowByHwnd(ev->hwnd);
-    CrashIf(!win);
+    ReportIf(!win);
     if (!win) {
         return;
     }
@@ -944,7 +944,7 @@ void TocTreeMouseWheelHandler(MouseWheelEvent* ev) {
 #if 0
 void TocTreeCharHandler(CharEvent* ev) {
     MainWindow* win = FindMainWindowByHwnd(ev->hwnd);
-    CrashIf(!win);
+    ReportIf(!win);
     if (!win) {
         return;
     }
@@ -999,7 +999,7 @@ void CreateToc(MainWindow* win) {
     // treeView->onMouseWheel = TocTreeMouseWheelHandler;
 
     treeView->Create(args);
-    CrashIf(!treeView->hwnd);
+    ReportIf(!treeView->hwnd);
     win->tocTreeView = treeView;
 
     SubclassToc(win);
diff --git a/src/Tabs.cpp b/src/Tabs.cpp
index 5ada93dd8de..1628445677c 100644
--- a/src/Tabs.cpp
+++ b/src/Tabs.cpp
@@ -91,7 +91,7 @@ void RemoveTab(WindowTab* tab) {
     win->tabSelectionHistory->Remove(tab);
     int idx = win->GetTabIdx(tab);
     WindowTab* tab2 = win->tabsCtrl->RemoveTab<WindowTab*>(idx);
-    CrashIf(tab != tab2);
+    ReportIf(tab != tab2);
     if (tab == win->CurrentTab()) {
         win->ctrl = nullptr;
         win->currentTabTemp = nullptr;
@@ -414,7 +414,7 @@ void CreateTabbar(MainWindow* win) {
 
 // verifies that WindowTab state is consistent with MainWindow state
 static NO_INLINE void VerifyWindowTab(MainWindow* win, WindowTab* tdata) {
-    CrashIf(tdata->ctrl != win->ctrl);
+    ReportIf(tdata->ctrl != win->ctrl);
 #if 0
     // disabling this check. best I can tell, external apps can change window
     // title and trigger this
@@ -447,7 +447,7 @@ void SaveCurrentWindowTab(MainWindow* win) {
         return;
     }
     if (win->CurrentTab() != win->Tabs().at(current)) {
-        return; // TODO: restore CrashIf() ?
+        return; // TODO: restore ReportIf() ?
     }
 
     WindowTab* tab = win->CurrentTab();
@@ -463,7 +463,7 @@ void SaveCurrentWindowTab(MainWindow* win) {
 }
 
 WindowTab* AddTabToWindow(MainWindow* win, WindowTab* tab) {
-    CrashIf(!win);
+    ReportIf(!win);
     if (!win) {
         return nullptr;
     }
@@ -484,7 +484,7 @@ WindowTab* AddTabToWindow(MainWindow* win, WindowTab* tab) {
         newTab->canClose = true;
         newTab->userData = (UINT_PTR)homeTab;
         int insertedIdx = tabs->InsertTab(idx, newTab);
-        CrashIf(insertedIdx != 0);
+        ReportIf(insertedIdx != 0);
         idx++;
     }
 
@@ -495,7 +495,7 @@ WindowTab* AddTabToWindow(MainWindow* win, WindowTab* tab) {
     newTab->userData = (UINT_PTR)tab;
 
     int insertedIdx = tabs->InsertTab(idx, newTab);
-    CrashIf(insertedIdx == -1);
+    ReportIf(insertedIdx == -1);
     tabs->SetSelected(insertedIdx);
     UpdateTabWidth(win);
     return tab;
@@ -504,12 +504,12 @@ WindowTab* AddTabToWindow(MainWindow* win, WindowTab* tab) {
 // Refresh the tab's title
 void TabsOnChangedDoc(MainWindow* win) {
     WindowTab* tab = win->CurrentTab();
-    CrashIf(!tab != !win->TabCount());
+    ReportIf(!tab != !win->TabCount());
     if (!tab) {
         return;
     }
 
-    CrashIf(win->GetTabIdx(tab) != win->tabsCtrl->GetSelected());
+    ReportIf(win->GetTabIdx(tab) != win->tabsCtrl->GetSelected());
     VerifyWindowTab(win, tab);
     UpdateTabTitle(tab);
 }
diff --git a/src/TextSearch.cpp b/src/TextSearch.cpp
index f3a860e1167..8de6ed3cc29 100644
--- a/src/TextSearch.cpp
+++ b/src/TextSearch.cpp
@@ -360,7 +360,7 @@ TextSel* TextSearch::FindFirst(int page, const WCHAR* text, ProgressUpdateUI* tr
 }
 
 TextSel* TextSearch::FindNext(ProgressUpdateUI* tracker) {
-    CrashIf(!findText);
+    ReportIf(!findText);
     if (!findText) {
         return nullptr;
     }
diff --git a/src/TextSelection.cpp b/src/TextSelection.cpp
index 7b7e14ac380..d4156d1e999 100644
--- a/src/TextSelection.cpp
+++ b/src/TextSelection.cpp
@@ -42,13 +42,13 @@ DocumentTextCache::~DocumentTextCache() {
 }
 
 bool DocumentTextCache::HasTextForPage(int pageNo) const {
-    CrashIf(pageNo < 1 || pageNo > nPages);
+    ReportIf(pageNo < 1 || pageNo > nPages);
     PageText* pageText = &pagesText[pageNo - 1];
     return pageText->text != nullptr;
 }
 
 const WCHAR* DocumentTextCache::GetTextForPage(int pageNo, int* lenOut, Rect** coordsOut) {
-    CrashIf(pageNo < 1 || pageNo > nPages);
+    ReportIf(pageNo < 1 || pageNo > nPages);
 
     ScopedCritSec scope(&access);
     PageText* pageText = &pagesText[pageNo - 1];
@@ -126,7 +126,7 @@ static int FindClosestGlyph(TextSelection* ts, int pageNo, double x, double y) {
     if (-1 == result) {
         return 0;
     }
-    CrashIf(result < 0 || result >= textLen);
+    ReportIf(result < 0 || result >= textLen);
 
     // the result indexes the first glyph to be selected in a forward selection
     RectF bbox = ts->engine->Transform(ToRectF(coords[result]), pageNo, 1.0, 0);
@@ -138,7 +138,7 @@ static int FindClosestGlyph(TextSelection* ts, int pageNo, double x, double y) {
             result++;
         }
     }
-    CrashIf(result > 0 && result < textLen && coords[result] == coords[result - 1]);
+    ReportIf(result > 0 && result < textLen && coords[result] == coords[result - 1]);
 
     return result;
 }
@@ -147,7 +147,7 @@ static void FillResultRects(TextSelection* ts, int pageNo, int glyph, int length
     int len;
     Rect* coords;
     const WCHAR* text = ts->textCache->GetTextForPage(pageNo, &len, &coords);
-    CrashIf(len < glyph + length);
+    ReportIf(len < glyph + length);
     Rect mediabox = ts->engine->PageMediabox(pageNo).Round();
     Rect *c = &coords[glyph], *end = c + length;
     while (c < end) {
@@ -179,7 +179,7 @@ static void FillResultRects(TextSelection* ts, int pageNo, int glyph, int length
 
         int currLen = ts->result.len;
         int left = ts->result.cap - currLen;
-        CrashIf(left < 0);
+        ReportIf(left < 0);
         if (left == 0) {
             int newCap = ts->result.cap * 2;
             if (newCap < 64) {
@@ -187,8 +187,8 @@ static void FillResultRects(TextSelection* ts, int pageNo, int glyph, int length
             }
             int* newPages = (int*)realloc(ts->result.pages, sizeof(int) * newCap);
             Rect* newRects = (Rect*)realloc(ts->result.rects, sizeof(Rect) * newCap);
-            CrashIf(!newPages);
-            CrashIf(!newRects);
+            ReportIf(!newPages);
+            ReportIf(!newRects);
             ts->result.pages = newPages;
             ts->result.rects = newRects;
             ts->result.cap = newCap;
diff --git a/src/Theme.cpp b/src/Theme.cpp
index 83326297769..a17592ef2b4 100644
--- a/src/Theme.cpp
+++ b/src/Theme.cpp
@@ -194,7 +194,7 @@ int GetCurrentThemeIndex() {
 extern void UpdateAfterThemeChange();
 
 void SetThemeByIndex(int themeIdx) {
-    CrashIf((themeIdx < 0) || (themeIdx >= kThemeCount));
+    ReportIf((themeIdx < 0) || (themeIdx >= kThemeCount));
     if (themeIdx >= kThemeCount) {
         themeIdx = 0;
     }
diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp
index 23573d24b69..b1af8f86dd5 100644
--- a/src/Toolbar.cpp
+++ b/src/Toolbar.cpp
@@ -889,7 +889,7 @@ constexpr int kDefaultIconSize = 18;
 
 static int SetToolbarIconsImageList(MainWindow* win) {
     HWND hwndToolbar = win->hwndToolbar;
-    CrashIf(!hwndToolbar);
+    ReportIf(!hwndToolbar);
     HWND hwndParent = GetParent(hwndToolbar);
 
     // we call it ToolbarSize for users, but it's really size of the icon
@@ -961,7 +961,7 @@ void CreateToolbar(MainWindow* win) {
         }
     }
     BOOL ok = SendMessageW(hwndToolbar, TB_ADDBUTTONS, kButtonsCount, (LPARAM)tbButtons);
-    CrashIf(!ok);
+    ReportIf(!ok);
 
     SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(iconSize, iconSize));
 
diff --git a/src/Translations.cpp b/src/Translations.cpp
index 2ac04d44ab8..5a5854ce830 100644
--- a/src/Translations.cpp
+++ b/src/Translations.cpp
@@ -121,7 +121,7 @@ static void ParseTranslationsTxt(const ByteSlice& d, const char* langCode) {
     int nTrans = 0;
     while (i < nLines) {
         orig = lines[i];
-        CrashIf(*orig != ':');
+        ReportIf(*orig != ':');
         orig += 1; // skip the ':' at the beginning
         i++;
         trans = nullptr;
@@ -140,7 +140,7 @@ static void ParseTranslationsTxt(const ByteSlice& d, const char* langCode) {
         Translation& translation = c->translations[nTrans++];
         int idxStr = c->allStrings.Size();
         // when this fires, we'll have to bump strIdx form u16 to u32
-        CrashIf(idxStr > 64 * 1024);
+        ReportIf(idxStr > 64 * 1024);
         translation.idxStr = (u16)idxStr;
         TempStr unescaped = UnescapeTemp(orig);
         c->allStrings.Append(unescaped);
@@ -149,20 +149,20 @@ static void ParseTranslationsTxt(const ByteSlice& d, const char* langCode) {
             continue;
         }
         int idxTrans = c->allTranslations.Size();
-        CrashIf(idxTrans > 64 * 1024);
+        ReportIf(idxTrans > 64 * 1024);
         translation.idxTrans = (u16)idxTrans;
         unescaped = UnescapeTemp(trans);
         c->allTranslations.Append(unescaped);
     }
-    CrashIf(nTrans != c->nTranslations);
+    ReportIf(nTrans != c->nTranslations);
     if (c->nUntranslated > 0 && !str::Eq(langCode, "en:")) {
         logf("Untranslated strings: %d for lang '%s'\n", c->nUntranslated, langCode);
     }
 }
 
 static Translation* FindTranslation(const char* s) {
-    CrashIf(!s);
-    CrashIf(!gTranslationCache);
+    ReportIf(!s);
+    ReportIf(!gTranslationCache);
     auto c = gTranslationCache;
     for (int i = 0; i < c->nTranslations; i++) {
         Translation& trans = c->translations[i];
@@ -210,12 +210,12 @@ void SetCurrentLangByCode(const char* langCode) {
         // set to English
         idx = 0;
     }
-    CrashIf(-1 == idx);
+    ReportIf(-1 == idx);
     gCurrLangIdx = idx;
     gCurrLangCode = GetLangCodeByIdx(idx);
 
     ByteSlice d = LoadDataResource(2);
-    CrashIf(d.empty());
+    ReportIf(d.empty());
     ParseTranslationsTxt(d, langCode);
     free(d.data());
 }
diff --git a/src/Uninstaller.cpp b/src/Uninstaller.cpp
index 949320302f0..b32479a4b99 100644
--- a/src/Uninstaller.cpp
+++ b/src/Uninstaller.cpp
@@ -263,7 +263,7 @@ static bool RegisterWinClass() {
     wcex.hIcon = LoadIconW(h, iconName);
 
     ATOM atom = RegisterClassExW(&wcex);
-    CrashIf(!atom);
+    ReportIf(!atom);
     return atom != 0;
 }
 
diff --git a/src/UpdateCheck.cpp b/src/UpdateCheck.cpp
index 79dff56e054..81d28d91749 100644
--- a/src/UpdateCheck.cpp
+++ b/src/UpdateCheck.cpp
@@ -246,7 +246,7 @@ static void NotifyUserOfUpdate(UpdateInfo* updateInfo) {
     BOOL verificationFlagChecked = false;
 
     auto hr = TaskDialogIndirect(&dialogConfig, &buttonPressedId, nullptr, &verificationFlagChecked);
-    CrashIf(hr == E_INVALIDARG);
+    ReportIf(hr == E_INVALIDARG);
     bool doInstall = (hr == S_OK) && (buttonPressedId == kBtnIdInstall);
 
     auto installerPath = updateInfo->installerPath;
@@ -473,7 +473,7 @@ void CheckForUpdateAsync(MainWindow* win, UpdateCheck updateCheckType) {
 // we should copy ourselves over the existing file, launch ourselves and
 // tell our new copy to delete ourselves
 void UpdateSelfTo(const char* path) {
-    CrashIf(!path);
+    ReportIf(!path);
     if (!file::Exists(path)) {
         logf("UpdateSelfTo: failed because destination doesn't exist\n");
         return;
diff --git a/src/Widget.cpp b/src/Widget.cpp
index 578b562c047..5fdfe776549 100644
--- a/src/Widget.cpp
+++ b/src/Widget.cpp
@@ -49,7 +49,7 @@ Size HwndWidgetText::MinIntrinsicSize(int width, int height) {
 }
 
 void HwndWidgetText::Draw(HDC hdc) {
-    CrashIf(lastBounds.IsEmpty());
+    ReportIf(lastBounds.IsEmpty());
     UINT fmt = DT_NOCLIP | DT_NOPREFIX | (isRtl ? DT_RTLREADING : DT_LEFT);
     RECT dr = ToRECT(lastBounds);
     HdcDrawText(hdc, s, &dr, fmt, font);
diff --git a/src/WindowTab.cpp b/src/WindowTab.cpp
index 53e0cb0659f..74a13cff4eb 100644
--- a/src/WindowTab.cpp
+++ b/src/WindowTab.cpp
@@ -33,7 +33,7 @@ void WindowTab::SetFilePath(const char* path) {
 }
 
 bool WindowTab::IsAboutTab() const {
-    CrashIf(type == WindowTab::Type::None);
+    ReportIf(type == WindowTab::Type::None);
     return type == WindowTab::Type::About;
 }
 
@@ -94,11 +94,11 @@ void WindowTab::MoveDocBy(int dx, int dy) const {
         return;
     }
     DisplayModel* dm = ctrl->AsFixed();
-    CrashIf(!dm);
+    ReportIf(!dm);
     if (!dm) {
         return;
     }
-    CrashIf(win->linkOnLastButtonDown);
+    ReportIf(win->linkOnLastButtonDown);
     if (win->linkOnLastButtonDown) {
         return;
     }
@@ -111,7 +111,7 @@ void WindowTab::MoveDocBy(int dx, int dy) const {
 }
 
 void WindowTab::ToggleZoom() const {
-    CrashIf(!ctrl);
+    ReportIf(!ctrl);
     if (!IsDocLoaded()) {
         return;
     }
@@ -140,7 +140,7 @@ bool SaveDataToFile(HWND hwndParent, char* fileNameA, ByteSlice data) {
         return false;
     }
 
-    // CrashIf(fileName && str::FindChar(fileName, '/'));
+    // ReportIf(fileName && str::FindChar(fileName, '/'));
 
     OPENFILENAME ofn{};
     ofn.lStructSize = sizeof(ofn);
diff --git a/src/ifilter/SearchFilterDll.cpp b/src/ifilter/SearchFilterDll.cpp
index a2c6cf79786..e2eabac0c94 100644
--- a/src/ifilter/SearchFilterDll.cpp
+++ b/src/ifilter/SearchFilterDll.cpp
@@ -96,7 +96,7 @@ class FilterClassFactory : public IClassFactory {
 
 STDAPI_(BOOL) DllMain(__unused HINSTANCE hInstance, DWORD dwReason, __unused LPVOID lpReserved) {
     if (dwReason == DLL_PROCESS_ATTACH) {
-        CrashIf(hInstance != GetInstance());
+        ReportIf(hInstance != GetInstance());
     }
     gLogAppName = "PdfFilter";
     gLogToConsole = false;
diff --git a/src/mui/Mui.cpp b/src/mui/Mui.cpp
index c4a09597a3d..ba6bc5da9ba 100644
--- a/src/mui/Mui.cpp
+++ b/src/mui/Mui.cpp
@@ -149,7 +149,7 @@ bool GraphicsCacheEntry::Create() {
 }
 
 void GraphicsCacheEntry::Free() const {
-    CrashIf(0 != refCount);
+    ReportIf(0 != refCount);
     delete gfx;
     delete bmp;
 }
@@ -192,9 +192,9 @@ HFONT CachedFont::GetHFont() {
         Graphics* gfx = AllocGraphicsForMeasureText();
         Status status = font->GetLogFontW(gfx, &lf);
         FreeGraphicsForMeasureText(gfx);
-        CrashIf(status != Ok);
+        ReportIf(status != Ok);
         hFont = CreateFontIndirectW(&lf);
-        CrashIf(!hFont);
+        ReportIf(!hFont);
     }
     LeaveMuiCriticalSection();
     return hFont;
@@ -259,7 +259,7 @@ Graphics* AllocGraphicsForMeasureText() {
         }
     }
     // We shouldn't get here - indicates ref counting problem
-    CrashIf(true);
+    ReportIf(true);
     return ce.gfx;
 }
 
@@ -269,13 +269,13 @@ void FreeGraphicsForMeasureText(Graphics* gfx) {
     DWORD threadId = GetCurrentThreadId();
     for (GraphicsCacheEntry& e : *gGraphicsCache) {
         if (e.gfx == gfx) {
-            CrashIf(e.threadId != threadId);
+            ReportIf(e.threadId != threadId);
             e.refCount--;
-            CrashIf(e.refCount < 0);
+            ReportIf(e.refCount < 0);
             return;
         }
     }
-    CrashIf(true);
+    ReportIf(true);
 }
 
 } // namespace mui
diff --git a/src/mui/TextRender.cpp b/src/mui/TextRender.cpp
index 6004439dcf2..6485c17addb 100644
--- a/src/mui/TextRender.cpp
+++ b/src/mui/TextRender.cpp
@@ -69,7 +69,7 @@ TextRenderGdi::~TextRenderGdi() {
     FreeMemBmp();
     DeleteDC(memHdc);
     DeleteDC(hdcForTextMeasure);
-    CrashIf(hdcGfxLocked); // hasn't been Unlock()ed
+    ReportIf(hdcGfxLocked); // hasn't been Unlock()ed
 }
 
 void TextRenderGdi::RestoreMemHdcPrevBitmap() {
@@ -113,7 +113,7 @@ float TextRenderGdi::GetCurrFontLineSpacing() {
 #if 1
     return currFont->font->GetHeight(gfx);
 #else
-    CrashIf(!currFont);
+    ReportIf(!currFont);
     TEXTMETRIC tm;
     GetTextMetrics(hdcForTextMeasure, &tm);
     return (float)tm.tmHeight;
@@ -154,10 +154,10 @@ void TextRenderGdi::SetTextBgColor(Gdiplus::Color col) {
 }
 
 void TextRenderGdi::Lock() {
-    CrashIf(hdcGfxLocked);
+    ReportIf(hdcGfxLocked);
     Region r;
     Status st = gfx->GetClip(&r); // must call before GetHDC(), which locks gfx
-    CrashIf(st != Ok);
+    ReportIf(st != Ok);
     HRGN hrgn = r.GetHRGN(gfx);
 
     hdcGfxLocked = gfx->GetHDC();
@@ -170,7 +170,7 @@ void TextRenderGdi::Lock() {
 }
 
 void TextRenderGdi::Unlock() {
-    CrashIf(!hdcGfxLocked);
+    ReportIf(!hdcGfxLocked);
     gfx->ReleaseHDC(hdcGfxLocked);
     hdcGfxLocked = nullptr;
 }
@@ -179,7 +179,7 @@ void TextRenderGdi::Draw(const WCHAR* s, size_t sLen, const RectF bb, bool isRtl
 #if 0
     DrawTransparent(s, sLen, bb, isRtl);
 #else
-    CrashIf(!hdcGfxLocked); // hasn't been Lock()ed
+    ReportIf(!hdcGfxLocked); // hasn't been Lock()ed
     int x = (int)bb.x;
     int y = (int)bb.y;
     uint opts = ETO_OPAQUE;
@@ -253,7 +253,7 @@ void TextRenderGdi::CreateClearBmpOfSize(int dx, int dy) {
 // maybe draw to in-memory bitmap, convert to Graphics bitmap and blit that bitmap to
 // Graphics object
 void TextRenderGdi::DrawTransparent(const WCHAR* s, size_t sLen, const RectF bb, bool isRtl) {
-    CrashIf(!hdcGfxLocked); // hasn't been Lock()ed
+    ReportIf(!hdcGfxLocked); // hasn't been Lock()ed
 
     int x = (int)bb.x;
     int y = (int)bb.y;
@@ -308,7 +308,7 @@ TextRenderGdiplus* TextRenderGdiplus::Create(Graphics* gfx, TextMeasureAlgorithm
 }
 
 void TextRenderGdiplus::SetFont(mui::CachedFont* font) {
-    CrashIf(!font->font);
+    ReportIf(!font->font);
     currFont = font;
 }
 
@@ -317,12 +317,12 @@ float TextRenderGdiplus::GetCurrFontLineSpacing() {
 }
 
 RectF TextRenderGdiplus::Measure(const WCHAR* s, size_t sLen) {
-    CrashIf(!currFont);
+    ReportIf(!currFont);
     return MeasureText(gfx, currFont->font, s, sLen, measureAlgo);
 }
 
 RectF TextRenderGdiplus::Measure(const char* s, size_t sLen) {
-    CrashIf(!currFont);
+    ReportIf(!currFont);
     WCHAR* buf = ToWStrTemp(s, sLen);
     size_t strLen = str::Len(buf);
     return MeasureText(gfx, currFont->font, buf, strLen, measureAlgo);
@@ -405,7 +405,7 @@ TextRenderHdc* TextRenderHdc::Create(Graphics* gfx, int dx, int dy) {
 }
 
 void TextRenderHdc::SetFont(CachedFont* font) {
-    CrashIf(!hdc);
+    ReportIf(!hdc);
     // I'm not sure how expensive SelectFont() is so avoid it just in case
     if (currFont == font) {
         return;
@@ -415,7 +415,7 @@ void TextRenderHdc::SetFont(CachedFont* font) {
 }
 
 void TextRenderHdc::SetTextColor(Gdiplus::Color col) {
-    CrashIf(!hdc);
+    ReportIf(!hdc);
     if (textColor.GetValue() == col.GetValue()) {
         return;
     }
@@ -424,7 +424,7 @@ void TextRenderHdc::SetTextColor(Gdiplus::Color col) {
 }
 
 void TextRenderHdc::SetTextBgColor(Gdiplus::Color col) {
-    CrashIf(!hdc);
+    ReportIf(!hdc);
     if (textBgColor.GetValue() == col.GetValue()) {
         return;
     }
@@ -437,8 +437,8 @@ float TextRenderHdc::GetCurrFontLineSpacing() {
 }
 
 RectF TextRenderHdc::Measure(const char* s, size_t sLen) {
-    CrashIf(!currFont);
-    CrashIf(!hdc);
+    ReportIf(!currFont);
+    ReportIf(!hdc);
     WCHAR* buf = ToWStrTemp(s, sLen);
     size_t strLen = str::Len(buf);
     return Measure(buf, strLen);
@@ -446,7 +446,7 @@ RectF TextRenderHdc::Measure(const char* s, size_t sLen) {
 
 RectF TextRenderHdc::Measure(const WCHAR* s, size_t sLen) {
     SIZE txtSize;
-    CrashIf(!hdc);
+    ReportIf(!hdc);
     GetTextExtentPoint32W(hdc, s, (int)sLen, &txtSize);
     RectF res(0.0f, 0.0f, (float)txtSize.cx, (float)txtSize.cy);
     return res;
@@ -459,7 +459,7 @@ void TextRenderHdc::Draw(const char* s, size_t sLen, const RectF bb, bool isRtl)
 }
 
 void TextRenderHdc::Draw(const WCHAR* s, size_t sLen, const RectF bb, bool /* isRtl */) {
-    CrashIf(!hdc);
+    ReportIf(!hdc);
     int x = (int)bb.x;
     int y = (int)bb.y;
     uint opts = ETO_OPAQUE;
@@ -491,7 +491,7 @@ ITextRender* CreateTextRender(TextRenderMethod method, Graphics* gfx, int dx, in
     if (TextRenderMethod::Hdc == method) {
         res = TextRenderHdc::Create(gfx, dx, dy);
     }
-    CrashIf(!res);
+    ReportIf(!res);
     if (res) {
         res->method = method;
     }
@@ -511,7 +511,7 @@ size_t StringLenForWidth(ITextRender* textMeasure, const WCHAR* s, size_t len, f
     }
     // make the best guess of the length that fits
     size_t n = (size_t)((dx / r.dx) * (float)len);
-    CrashIf(n > len);
+    ReportIf(n > len);
     r = textMeasure->Measure(s, n);
     // find the length len of s that fits within dx iff width of len+1 exceeds dx
     int dir = 1; // increasing length
diff --git a/src/previewer/PdfPreviewDll.cpp b/src/previewer/PdfPreviewDll.cpp
index ea138147574..145ea2b9969 100644
--- a/src/previewer/PdfPreviewDll.cpp
+++ b/src/previewer/PdfPreviewDll.cpp
@@ -155,7 +155,7 @@ static const char* GetReason(DWORD dwReason) {
 
 STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, void*) {
     if (dwReason == DLL_PROCESS_ATTACH) {
-        CrashIf(hInstance != GetInstance());
+        ReportIf(hInstance != GetInstance());
     }
     gLogAppName = "PdfPreview";
     logf("PdfPreview: DllMain %s\n", GetReason(dwReason));
diff --git a/src/regress/Regress.cpp b/src/regress/Regress.cpp
index abb13ea1aac..c2c22436bf4 100644
--- a/src/regress/Regress.cpp
+++ b/src/regress/Regress.cpp
@@ -7,7 +7,7 @@ are too time consuming to be part of unit tests. The tests can rely
 on presence of shared test files.
 
 Note: because it can be run as both release and debug, we can't use
-assert() or CrashIf() but ReportIf().
+assert() or ReportIf() but ReportIf().
 
 To write new regression test:
 - add a file src/regress/Regress${NN}.cpp with Regress${NN} function
@@ -65,7 +65,7 @@ static void printflush(const char* s) {
 option to specify this directory, for now just add your location(s) to the list */
 static bool FindTestFilesDir() {
     const char* dirsToCheck[] = {"C:\\Documents and Settings\\kkowalczyk\\My Documents\\Google Drive\\Sumatra",
-                            "C:\\Users\\kkowalczyk\\Google Drive\\Sumatra"};
+                                 "C:\\Users\\kkowalczyk\\Google Drive\\Sumatra"};
     for (size_t i = 0; i < dimof(dirsToCheck); i++) {
         const char* dir = dirsToCheck[i];
         if (dir::Exists(dir)) {
diff --git a/src/regress/Regress03.cpp b/src/regress/Regress03.cpp
index 283b1fdb321..948e17d4f6c 100644
--- a/src/regress/Regress03.cpp
+++ b/src/regress/Regress03.cpp
@@ -25,12 +25,12 @@ void SearchTestWithDir(const char* searchFileA, const WCHAR* searchTerm, const T
          tsel = tsrch->FindNext(), ++findCount, expIndex += expIncr) {
         if (0 == expected[expIndex].len) {
             wprintf(L"Found %s %i times, not expecting another match\n", searchTerm, expIndex);
-            CrashIf(true);
+            ReportIf(true);
         }
         if (expected[expIndex].len != tsel->len) {
             wprintf(L"Text selection length mismatch for %s at occurence %i: got %i, wanted %i\n", searchTerm,
                     findCount, expected[expIndex].len, tsel->len);
-            CrashIf(true);
+            ReportIf(true);
         }
         for (int i = 0; i < tsel->len; ++i) {
             if ((expected[expIndex].pages[i] != tsel->pages[i]) || (expected[expIndex].rects[i] != tsel->rects[i])) {
@@ -41,20 +41,20 @@ void SearchTestWithDir(const char* searchFileA, const WCHAR* searchTerm, const T
                     searchTerm, expected[expIndex].pages[i], expected[expIndex].rects[i].x,
                     expected[expIndex].rects[i].y, expected[expIndex].rects[i].dx, expected[expIndex].rects[i].dy,
                     tsel->pages[i], tsel->rects[i].x, tsel->rects[i].y, tsel->rects[i].dx, tsel->rects[i].dy);
-                CrashIf(true);
+                ReportIf(true);
             }
         }
     }
     if (TextSearchDirection::Forward == direction) {
         if (findCount != expectedLen) {
             wprintf(L"Found only %d matches of '%s', expected %d\n", expIndex, searchTerm, expectedLen);
-            CrashIf(true);
+            ReportIf(true);
         }
     } else {
         if (findCount != expectedLen) {
             wprintf(L"Found only %d matches of '%s', expected %d\n", expectedLen - expIndex - 1, searchTerm,
                     expectedLen);
-            CrashIf(true);
+            ReportIf(true);
         }
     }
     delete tsrch;
diff --git a/src/scratch.txt b/src/scratch.txt
index d6b20e3f161..0ef55649f26 100644
--- a/src/scratch.txt
+++ b/src/scratch.txt
@@ -11,7 +11,7 @@ static void ClearPixmap(fz_pixmap* pixmap) {
     size_t dx = (size_t)pixmap->w;
     size_t dy = (size_t)pixmap->h;
     u8* samples = pixmap->samples;
-    CrashIf(pixmap->n != 3);
+    ReportIf(pixmap->n != 3);
     for (size_t y = 0; y < dy; y++) {
         u8* d = samples + (stride * y);
         for (size_t x = 0; x < dx; x++) {
diff --git a/src/testcode/TestApp.cpp b/src/testcode/TestApp.cpp
index f2da3acf8f8..7a6413324d1 100644
--- a/src/testcode/TestApp.cpp
+++ b/src/testcode/TestApp.cpp
@@ -59,12 +59,12 @@ void TestApp(HINSTANCE hInstance) {
     gHinst = hInstance;
 
     auto w = new TestWnd();
-    //w->backgroundColor = MkColor((u8)0xae, (u8)0xae, (u8)0xae);
+    // w->backgroundColor = MkColor((u8)0xae, (u8)0xae, (u8)0xae);
     CreateCustomArgs args;
     args.pos = {CW_USEDEFAULT, CW_USEDEFAULT, 480, 640};
     args.title = "a little test app";
     HWND hwnd = w->CreateCustom(args);
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
 
     w->layout = CreateMainLayout(w->hwnd);
     LayoutToSize(w->layout, {480, 640});
diff --git a/src/testcode/test-app.cpp b/src/testcode/test-app.cpp
index 9246bfa694c..84b5d13fc5a 100755
--- a/src/testcode/test-app.cpp
+++ b/src/testcode/test-app.cpp
@@ -52,8 +52,8 @@ void _uploadDebugReportIfFunc(__unused bool cond, __unused const char* condStr)
     // no-op implementation to satisfy SubmitBugReport()
 }
 
-int APIENTRY WinMain(HINSTANCE hInstance, __unused  HINSTANCE hPrevInstance, __unused  LPSTR lpCmdLine,
-                     __unused  int nCmdShow) {
+int APIENTRY WinMain(HINSTANCE hInstance, __unused HINSTANCE hPrevInstance, __unused LPSTR lpCmdLine,
+                     __unused int nCmdShow) {
     // SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE);
     // SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
 #if 0
@@ -73,7 +73,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, __unused  HINSTANCE hPrevInstance, __u
     w->initialPos = {100, 100};
     w->initialSize = {480, 640};
     bool ok = w->Create();
-    CrashIf(!ok);
+    ReportIf(!ok);
 
     auto l = CreateMainLayout(w->hwnd);
     w->onSize = [&](SizeEvent* args) {
diff --git a/src/tools/MakeLzSA.cpp b/src/tools/MakeLzSA.cpp
index ba7bd73e1dd..3c7b09a9dcf 100644
--- a/src/tools/MakeLzSA.cpp
+++ b/src/tools/MakeLzSA.cpp
@@ -37,7 +37,7 @@ struct ISzCrtAlloc : ISzAlloc {
 #define LZMA_HEADER_SIZE (1 + LZMA_PROPS_SIZE)
 
 static bool Compress(const char* uncompressed, size_t uncompressedSize, char* compressed, size_t* compressedSize) {
-    CrashIf(*compressedSize < uncompressedSize + 1);
+    ReportIf(*compressedSize < uncompressedSize + 1);
     if (*compressedSize < uncompressedSize + 1)
         return false;
 
@@ -82,7 +82,7 @@ static bool Compress(const char* uncompressed, size_t uncompressedSize, char* co
 static bool AppendEntry(str::Str& data, str::Str& content, const char* filePath, const char* inArchiveName,
                         lzma::FileInfo* fi = nullptr) {
     size_t nameLen = str::Len(inArchiveName);
-    CrashIf(nameLen > UINT32_MAX - 25);
+    ReportIf(nameLen > UINT32_MAX - 25);
     u32 headerSize = 25 + (u32)nameLen;
     FILETIME ft = file::GetModificationTime(filePath);
 
@@ -97,7 +97,7 @@ static bool AppendEntry(str::Str& data, str::Str& content, const char* filePath,
         meta.Write32(fi->uncompressedCrc32);
         meta.Write32(ft.dwLowDateTime);
         meta.Write32(ft.dwHighDateTime);
-        CrashIf(meta.Size() != kBufSize);
+        ReportIf(meta.Size() != kBufSize);
         data.AppendSlice(meta.AsByteSlice());
         data.Append(inArchiveName, nameLen + 1);
         return content.Append(fi->compressedData, fi->compressedSize);
@@ -128,7 +128,7 @@ static bool AppendEntry(str::Str& data, str::Str& content, const char* filePath,
     meta.Write32(fileDataCrc);
     meta.Write32(ft.dwLowDateTime);
     meta.Write32(ft.dwHighDateTime);
-    CrashIf(meta.Size() != kBufSize);
+    ReportIf(meta.Size() != kBufSize);
     data.AppendSlice(meta.AsByteSlice());
     data.Append(inArchiveName, nameLen + 1);
     return content.Append(compressed, compressedSize);
@@ -153,7 +153,7 @@ bool CreateArchive(const char* archivePath, StrVec& files, size_t skipFiles = 0)
     ByteWriterLE lzsaHeader(kBufSize);
     lzsaHeader.Write32(LZMA_MAGIC_ID);
     lzsaHeader.Write32((u32)(files.Size() - skipFiles));
-    CrashIf(lzsaHeader.Size() != kBufSize);
+    ReportIf(lzsaHeader.Size() != kBufSize);
     data.AppendSlice(lzsaHeader.AsByteSlice());
 
     for (int i = skipFiles; i < files.Size(); i++) {
@@ -184,7 +184,7 @@ bool CreateArchive(const char* archivePath, StrVec& files, size_t skipFiles = 0)
     u32 headerCrc32 = crc32(0, (const u8*)data.Get(), (u32)data.size());
     ByteWriterLE buf(4);
     buf.Write32(headerCrc32);
-    CrashIf(buf.Size() != 4);
+    ReportIf(buf.Size() != 4);
     data.AppendSlice(buf.AsByteSlice());
     if (!data.Append(content.Get(), content.size()))
         return false;
diff --git a/src/uia/DocumentProvider.cpp b/src/uia/DocumentProvider.cpp
index 3e5056f4f3a..2c1da6f4284 100644
--- a/src/uia/DocumentProvider.cpp
+++ b/src/uia/DocumentProvider.cpp
@@ -92,18 +92,18 @@ bool SumatraUIAutomationDocumentProvider::IsDocumentLoaded() const {
 }
 
 DisplayModel* SumatraUIAutomationDocumentProvider::GetDM() {
-    CrashIf(!IsDocumentLoaded());
-    CrashIf(!dm);
+    ReportIf(!IsDocumentLoaded());
+    ReportIf(!dm);
     return dm;
 }
 
 SumatraUIAutomationPageProvider* SumatraUIAutomationDocumentProvider::GetFirstPage() {
-    CrashIf(!IsDocumentLoaded());
+    ReportIf(!IsDocumentLoaded());
     return child_first;
 }
 
 SumatraUIAutomationPageProvider* SumatraUIAutomationDocumentProvider::GetLastPage() {
-    CrashIf(!IsDocumentLoaded());
+    ReportIf(!IsDocumentLoaded());
     return child_last;
 }
 
@@ -122,7 +122,7 @@ ULONG STDMETHODCALLTYPE SumatraUIAutomationDocumentProvider::AddRef() {
 
 ULONG STDMETHODCALLTYPE SumatraUIAutomationDocumentProvider::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -175,7 +175,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationDocumentProvider::GetRuntimeId(SAFE
     LONG rId[] = {(LONG)canvasHwnd, SUMATRA_UIA_DOCUMENT_RUNTIME_ID};
     for (LONG i = 0; i < 2; i++) {
         HRESULT hr = SafeArrayPutElement(psa, &i, (void*)&(rId[i]));
-        CrashIf(FAILED(hr));
+        ReportIf(FAILED(hr));
     }
 
     *pRetVal = psa;
@@ -305,7 +305,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationDocumentProvider::GetSelection(SAFE
 
     LONG index = 0;
     HRESULT hr = SafeArrayPutElement(psa, &index, selection);
-    CrashIf(FAILED(hr));
+    ReportIf(FAILED(hr));
     // the array now owns the selection
     selection->Release();
 
@@ -331,7 +331,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationDocumentProvider::GetVisibleRanges(
         }
         it = it->sibling_next;
     }
-    CrashIf(ULONG_MAX == rangeArray.size());
+    ReportIf(ULONG_MAX == rangeArray.size());
 
     SAFEARRAY* psa = SafeArrayCreateVector(VT_UNKNOWN, 0, (ULONG)rangeArray.size());
     if (!psa) {
@@ -343,7 +343,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationDocumentProvider::GetVisibleRanges(
 
     for (LONG i = 0; i < (LONG)rangeArray.size(); i++) {
         HRESULT hr = SafeArrayPutElement(psa, &i, rangeArray[i]);
-        CrashIf(FAILED(hr));
+        ReportIf(FAILED(hr));
         rangeArray[i]->Release();
     }
 
diff --git a/src/uia/PageProvider.cpp b/src/uia/PageProvider.cpp
index ad3053cf9a5..6e1e364e281 100644
--- a/src/uia/PageProvider.cpp
+++ b/src/uia/PageProvider.cpp
@@ -63,7 +63,7 @@ ULONG STDMETHODCALLTYPE SumatraUIAutomationPageProvider::AddRef() {
 
 ULONG STDMETHODCALLTYPE SumatraUIAutomationPageProvider::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -114,7 +114,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationPageProvider::GetRuntimeId(SAFEARRA
     int rId[] = {(int)canvasHwnd, SUMATRA_UIA_PAGE_RUNTIME_ID(pageNum)};
     for (LONG i = 0; i < 2; i++) {
         HRESULT hr = SafeArrayPutElement(psa, &i, (void*)&(rId[i]));
-        CrashIf(FAILED(hr));
+        ReportIf(FAILED(hr));
     }
 
     *pRetVal = psa;
diff --git a/src/uia/Provider.cpp b/src/uia/Provider.cpp
index 68000b72a4b..b041f06afe4 100644
--- a/src/uia/Provider.cpp
+++ b/src/uia/Provider.cpp
@@ -27,7 +27,7 @@ SumatraUIAutomationProvider::~SumatraUIAutomationProvider() {
 }
 
 void SumatraUIAutomationProvider::OnDocumentLoad(DisplayModel* dm) {
-    CrashIf(document);
+    ReportIf(document);
 
     document = new SumatraUIAutomationDocumentProvider(canvasHwnd, this);
     document->LoadDocument(dm);
@@ -63,7 +63,7 @@ ULONG STDMETHODCALLTYPE SumatraUIAutomationProvider::AddRef() {
 
 ULONG STDMETHODCALLTYPE SumatraUIAutomationProvider::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
diff --git a/src/uia/StartPageProvider.cpp b/src/uia/StartPageProvider.cpp
index 443e1f3a18f..e30bc138f5b 100644
--- a/src/uia/StartPageProvider.cpp
+++ b/src/uia/StartPageProvider.cpp
@@ -30,7 +30,7 @@ ULONG STDMETHODCALLTYPE SumatraUIAutomationStartPageProvider::AddRef() {
 
 ULONG STDMETHODCALLTYPE SumatraUIAutomationStartPageProvider::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -71,7 +71,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationStartPageProvider::GetRuntimeId(SAF
     int rId[] = {(int)canvasHwnd, SUMATRA_UIA_STARTPAGE_RUNTIME_ID};
     for (LONG i = 0; i < 2; i++) {
         HRESULT hr = SafeArrayPutElement(psa, &i, (void*)&(rId[i]));
-        CrashIf(FAILED(hr));
+        ReportIf(FAILED(hr));
     }
 
     *pRetVal = psa;
diff --git a/src/uia/TextRange.cpp b/src/uia/TextRange.cpp
index cdf62901372..94c57250e24 100644
--- a/src/uia/TextRange.cpp
+++ b/src/uia/TextRange.cpp
@@ -91,8 +91,8 @@ bool SumatraUIAutomationTextRange::IsEmptyRange() const {
 }
 
 int SumatraUIAutomationTextRange::GetPageGlyphCount(int pageNum) {
-    CrashIf(!document->IsDocumentLoaded());
-    CrashIf(pageNum <= 0);
+    ReportIf(!document->IsDocumentLoaded());
+    ReportIf(pageNum <= 0);
 
     int pageLen;
     document->GetDM()->textCache->GetTextForPage(pageNum, &pageLen);
@@ -100,7 +100,7 @@ int SumatraUIAutomationTextRange::GetPageGlyphCount(int pageNum) {
 }
 
 int SumatraUIAutomationTextRange::GetPageCount() {
-    CrashIf(!document->IsDocumentLoaded());
+    ReportIf(!document->IsDocumentLoaded());
 
     return document->GetDM()->PageCount();
 }
@@ -218,7 +218,7 @@ ULONG STDMETHODCALLTYPE SumatraUIAutomationTextRange::AddRef() {
 
 ULONG STDMETHODCALLTYPE SumatraUIAutomationTextRange::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -558,11 +558,11 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationTextRange::MoveEndpointByUnit(TextP
         virtual bool NextEndpoint() const {
             // HACK: Declaring these as pure virtual causes "unreferenced local variable" warnings ==> define a dummy
             // body to get rid of warnings
-            CrashIf(true);
+            ReportIf(true);
             return false;
         }
         virtual bool PrevEndpoint() const {
-            CrashIf(true);
+            ReportIf(true);
             return false;
         }
 
@@ -842,7 +842,7 @@ HRESULT STDMETHODCALLTYPE SumatraUIAutomationTextRange::GetChildren(SAFEARRAY**
             LONG index = it->GetPageNum() - startPage;
 
             HRESULT hr = SafeArrayPutElement(psa, &index, it);
-            CrashIf(FAILED(hr));
+            ReportIf(FAILED(hr));
             it->AddRef();
         }
 
diff --git a/src/utils/Archive.cpp b/src/utils/Archive.cpp
index 76fa936a85d..3095ed956b8 100644
--- a/src/utils/Archive.cpp
+++ b/src/utils/Archive.cpp
@@ -29,7 +29,7 @@ FILETIME MultiFormatArchive::FileInfo::GetWinFileTime() const {
 
 MultiFormatArchive::MultiFormatArchive(archive_opener_t opener, MultiFormatArchive::Format format)
     : format(format), opener_(opener) {
-    CrashIf(!opener);
+    ReportIf(!opener);
     if (format == Format::Tar)
         loadOnOpen = true;
 }
@@ -121,10 +121,10 @@ ByteSlice MultiFormatArchive::GetFileDataById(size_t fileId) {
     if (fileId == (size_t)-1) {
         return {};
     }
-    CrashIf(fileId >= fileInfos_.size());
+    ReportIf(fileId >= fileInfos_.size());
 
     auto* fileInfo = fileInfos_[fileId];
-    CrashIf(fileInfo->fileId != fileId);
+    ReportIf(fileInfo->fileId != fileId);
 
     if (fileInfo->data != nullptr) {
         // the caller takes ownership
@@ -265,7 +265,7 @@ struct Data {
 
 static size_t DataLeft(const Data& d) {
     size_t consumed = (d.curr - d.d);
-    CrashIf(consumed > d.sz);
+    ReportIf(consumed > d.sz);
     return d.sz - consumed;
 }
 
@@ -301,10 +301,10 @@ static bool FindFile(HANDLE hArc, RARHeaderDataEx* rarHeader, const WCHAR* fileN
 }
 
 ByteSlice MultiFormatArchive::GetFileDataByIdUnarrDll(size_t fileId) {
-    CrashIf(!rarFilePath_);
+    ReportIf(!rarFilePath_);
 
     auto* fileInfo = fileInfos_[fileId];
-    CrashIf(fileInfo->fileId != fileId);
+    ReportIf(fileInfo->fileId != fileId);
     if (fileInfo->data != nullptr) {
         return {(u8*)fileInfo->data, fileInfo->fileSizeUncompressed};
     }
@@ -334,7 +334,7 @@ ByteSlice MultiFormatArchive::GetFileDataByIdUnarrDll(size_t fileId) {
         goto Exit;
     }
     size = fileInfo->fileSizeUncompressed;
-    CrashIf(size != rarHeader.UnpSize);
+    ReportIf(size != rarHeader.UnpSize);
     if (addOverflows<size_t>(size, ZERO_PADDING_COUNT)) {
         ok = false;
         goto Exit;
@@ -367,7 +367,7 @@ bool MultiFormatArchive::OpenUnrarFallback(const char* rarPath) {
     if (!rarPath) {
         return false;
     }
-    CrashIf(rarFilePath_);
+    ReportIf(rarFilePath_);
     auto rarPathW = ToWStrTemp(rarPath);
 
     ByteSlice uncompressedBuf;
diff --git a/src/utils/BaseUtil.cpp b/src/utils/BaseUtil.cpp
index 5ee7c19139f..77de006fc30 100644
--- a/src/utils/BaseUtil.cpp
+++ b/src/utils/BaseUtil.cpp
@@ -60,7 +60,7 @@ int AtomicRefCount::Add() {
 // by all who held a reference to it
 bool AtomicRefCount::Dec() {
     auto res = InterlockedDecrement(&val);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     return res == 0;
 }
 
@@ -154,7 +154,7 @@ static void PoisonData(PoolAllocator::Block* curr) {
             d = (char*)curr + hdrSize;
             // the buffer is big so optimize to only poison the data
             // allocated in this block
-            CrashIf(d > curr->freeSpace);
+            ReportIf(d > curr->freeSpace);
             size_t n = (curr->freeSpace - d);
             const char* dead = "dea_";
             const char* dea0 = "dea\0";
@@ -184,7 +184,7 @@ static void ResetBlock(PoolAllocator::Block* block) {
     block->freeSpace = start + hdrSize;
     block->end = start + block->dataSize;
     block->next = nullptr;
-    CrashIf(RoundUp(block->freeSpace, kPoolAllocatorAlign) != block->freeSpace);
+    ReportIf(RoundUp(block->freeSpace, kPoolAllocatorAlign) != block->freeSpace);
 }
 
 void PoolAllocator::Reset(bool poisonFreedMemory) {
@@ -194,7 +194,7 @@ void PoolAllocator::Reset(bool poisonFreedMemory) {
     // with more effort we could preserve all blocks (not sure if worth it)
     Block* first = firstBlock;
     if (!first) {
-        CrashIf(currBlock);
+        ReportIf(currBlock);
         return;
     }
     if (poisonFreedMemory) {
@@ -240,7 +240,7 @@ void* PoolAllocator::Alloc(size_t size) {
     size_t sizeRounded = RoundUp(size, kPoolAllocatorAlign);
     size_t cbNeeded = sizeRounded + sizeof(i32);
     if (currBlock) {
-        CrashIf(currBlock->freeSpace > currBlock->end);
+        ReportIf(currBlock->freeSpace > currBlock->end);
         size_t cbAvail = (currBlock->end - currBlock->freeSpace);
         hasSpace = cbAvail >= cbNeeded;
     }
@@ -260,7 +260,7 @@ void* PoolAllocator::Alloc(size_t size) {
         block->dataSize = dataSize;
         ResetBlock(block);
         if (!firstBlock) {
-            CrashIf(currBlock);
+            ReportIf(currBlock);
             firstBlock = block;
         } else {
             currBlock->next = block;
@@ -274,9 +274,9 @@ void* PoolAllocator::Alloc(size_t size) {
         printSize("PoolAllocator: ", size);
         printSize("overshot: ", cbOvershot);
         printSize("hdrSizet: ", hdrSize);
-        CrashIf(true);
+        ReportIf(true);
     }
-    CrashIf(RoundUp(currBlock->freeSpace, kPoolAllocatorAlign) != currBlock->freeSpace);
+    ReportIf(RoundUp(currBlock->freeSpace, kPoolAllocatorAlign) != currBlock->freeSpace);
 
     char* blockStart = (char*)currBlock;
     i32 offset = (i32)(res - blockStart);
@@ -292,7 +292,7 @@ void* PoolAllocator::Alloc(size_t size) {
 void* PoolAllocator::At(int i) {
     ScopedCritSec scs(&cs);
 
-    CrashIf(i < 0 || i >= nAllocs);
+    ReportIf(i < 0 || i >= nAllocs);
     if (i < 0 || i >= nAllocs) {
         return nullptr;
     }
@@ -301,11 +301,11 @@ void* PoolAllocator::At(int i) {
         i -= (int)curr->nAllocs;
         curr = curr->next;
     }
-    CrashIf(!curr);
+    ReportIf(!curr);
     if (!curr) {
         return nullptr;
     }
-    CrashIf((size_t)i >= curr->nAllocs);
+    ReportIf((size_t)i >= curr->nAllocs);
     i32* index = (i32*)curr->end;
     // elements are in reverse
     size_t idx = curr->nAllocs - i - 1;
diff --git a/src/utils/BaseUtil.h b/src/utils/BaseUtil.h
index 8b550f25b28..ff90deeea51 100644
--- a/src/utils/BaseUtil.h
+++ b/src/utils/BaseUtil.h
@@ -251,8 +251,6 @@ inline void CrashMe() {
     } while (0)
 #endif
 
-// TODO: replace CrashIf() with ReportIf()
-#define CrashIf(cond) ReportIfCond(cond, #cond, false, true)
 #define ReportIf(cond) ReportIfCond(cond, #cond, false, true)
 #define ReportIfQuick(cond) ReportIfCond(cond, #cond, false, false)
 
@@ -284,7 +282,7 @@ inline T limitValue(T val, T min, T max) {
     if (min > max) {
         std::swap(min, max);
     }
-    CrashIf(min > max);
+    ReportIf(min > max);
     if (val < min) {
         return min;
     }
@@ -297,7 +295,7 @@ inline T limitValue(T val, T min, T max) {
 // return true if adding n to val overflows. Only valid for n > 0
 template <typename T>
 inline bool addOverflows(T val, T n) {
-    CrashIf(!(n > 0));
+    ReportIf(!(n > 0));
     T res = val + n;
     return val > res;
 }
diff --git a/src/utils/BitReader.cpp b/src/utils/BitReader.cpp
index d98765109e9..80a5328d7dc 100644
--- a/src/utils/BitReader.cpp
+++ b/src/utils/BitReader.cpp
@@ -37,7 +37,7 @@ size_t BitReader::BitsLeft() const {
 // Read bitsCount (up to 32) bits, without advancing the position in the bit stream
 // If asked for more bits than we have left, the extra bits will be 0
 u32 BitReader::Peek(size_t bitsCount) {
-    CrashIf((bitsCount == 0) || (bitsCount > 32));
+    ReportIf((bitsCount == 0) || (bitsCount > 32));
     size_t currBytePos = currBitPos / 8;
     u8 currByte = GetByte(currBytePos);
     u8 currBit = currBitPos % 8;
diff --git a/src/utils/ColorUtil.cpp b/src/utils/ColorUtil.cpp
index 49d397b7dd0..0ca380d91d0 100644
--- a/src/utils/ColorUtil.cpp
+++ b/src/utils/ColorUtil.cpp
@@ -119,7 +119,7 @@ void ParseColor(ParsedColor& parsed, const char* txt) {
 
 /* Parse 's' as hex color and return the result in 'destColor' */
 bool ParseColor(COLORREF* destColor, const char* s) {
-    CrashIf(!destColor);
+    ReportIf(!destColor);
     ParsedColor p;
     ParseColor(p, s);
     *destColor = p.col;
diff --git a/src/utils/CryptoUtil.cpp b/src/utils/CryptoUtil.cpp
index 0a325605f89..e0dc4e239b7 100644
--- a/src/utils/CryptoUtil.cpp
+++ b/src/utils/CryptoUtil.cpp
@@ -14,31 +14,31 @@ static NO_INLINE void CalcDigestWin(const void* data, int dataSize, u8* digest,
     HCRYPTPROV hProv = 0;
     HCRYPTHASH hHash = 0;
     BOOL ok = CryptAcquireContextW(&hProv, nullptr, provider, type, CRYPT_VERIFYCONTEXT);
-    CrashIf(!ok);
+    ReportIf(!ok);
     ok = CryptCreateHash(hProv, alg, 0, 0, &hHash);
-    CrashIf(!ok);
+    ReportIf(!ok);
 
 #ifdef _WIN64
     for (; dataSize > DWORD_MAX; data = (const BYTE*)data + DWORD_MAX, dataSize -= DWORD_MAX) {
         ok = CryptHashData(hHash, (const BYTE*)data, DWORD_MAX, 0);
-        CrashIf(!ok);
+        ReportIf(!ok);
     }
 #endif
-    CrashIf(dataSize > DWORD_MAX);
+    ReportIf(dataSize > DWORD_MAX);
     ok = CryptHashData(hHash, (const BYTE*)data, (DWORD)dataSize, 0);
-    CrashIf(!ok);
+    ReportIf(!ok);
 
     DWORD hashLen = 0;
     DWORD argSize = sizeof(DWORD);
     ok = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashLen, &argSize, 0);
-    CrashIf(sizeof(DWORD) != argSize);
-    CrashIf(!ok);
+    ReportIf(sizeof(DWORD) != argSize);
+    ReportIf(!ok);
     if (digestSize != hashLen) {
-        CrashIf(digestSize != hashLen);
+        ReportIf(digestSize != hashLen);
     }
     ok = CryptGetHashParam(hHash, HP_HASHVAL, digest, &hashLen, 0);
-    CrashIf(!ok);
-    CrashIf(digestSize != hashLen);
+    ReportIf(!ok);
+    ReportIf(digestSize != hashLen);
     CryptDestroyHash(hHash);
     CryptReleaseContext(hProv, 0);
 }
diff --git a/src/utils/CssParser.cpp b/src/utils/CssParser.cpp
index da1a0f9d8ea..bcee284abe2 100644
--- a/src/utils/CssParser.cpp
+++ b/src/utils/CssParser.cpp
@@ -44,7 +44,7 @@ static bool SkipQuotedString(const char*& s, const char* end) {
 }
 
 static bool SkipBlock(const char*& s, const char* end) {
-    CrashIf(s >= end || *s != '{');
+    ReportIf(s >= end || *s != '{');
     s++;
     while (s < end && *s != '}') {
         if (*s == '"' || *s == '\'') {
@@ -74,7 +74,7 @@ bool CssPullParser::NextRule() {
             ;
         }
     }
-    CrashIf(inProps && currPos < end);
+    ReportIf(inProps && currPos < end);
     if (inlineStyle || currPos == end) {
         return false;
     }
@@ -127,7 +127,7 @@ const CssSelector* CssPullParser::NextSelector() {
     while (currSel < selEnd && *currSel != ',') {
         if (*currSel == '"' || *currSel == '\'') {
             bool ok = SkipQuotedString(currSel, selEnd);
-            CrashIf(!ok);
+            ReportIf(!ok);
             sEnd = currSel;
         } else if (*currSel == '\\' && currSel < selEnd - 1) {
             currSel += 2;
diff --git a/src/utils/DbgHelpDyn.cpp b/src/utils/DbgHelpDyn.cpp
index 6ae16ac26aa..d038adabf57 100644
--- a/src/utils/DbgHelpDyn.cpp
+++ b/src/utils/DbgHelpDyn.cpp
@@ -476,7 +476,7 @@ str::Str* gCallstackLogs = nullptr;
 
 // start remembering callstack logs done with LogCallstack()
 void RememberCallstackLogs() {
-    CrashIf(gCallstackLogs);
+    ReportIf(gCallstackLogs);
     gCallstackLogs = new str::Str();
 }
 
diff --git a/src/utils/Dict.cpp b/src/utils/Dict.cpp
index ae51d2e3f8e..c0a0321ea99 100644
--- a/src/utils/Dict.cpp
+++ b/src/utils/Dict.cpp
@@ -85,7 +85,7 @@ struct HashTable {
 };
 
 static HashTable* NewHashTable(size_t size, Allocator* allocator) {
-    CrashIf(!allocator); // we'll leak otherwise
+    ReportIf(!allocator); // we'll leak otherwise
     HashTable* h = Allocator::AllocArray<HashTable>(allocator, 1);
     // number of hash table entries should be power of 2
     size = RoundToPowerOf2(size);
@@ -103,7 +103,7 @@ static void DeleteHashTable(HashTable* h) {
 
 static void HashTableResize(HashTable* h, HasherComparator* hc) {
     size_t newSize = RoundToPowerOf2(h->nEntries + 1);
-    CrashIf(newSize <= h->nEntries);
+    ReportIf(newSize <= h->nEntries);
     HashTableEntry** newEntries = AllocArray<HashTableEntry*>(newSize);
     HashTableEntry *e, *next;
     size_t hash, pos;
@@ -123,7 +123,7 @@ static void HashTableResize(HashTable* h, HasherComparator* hc) {
     h->nEntries = newSize;
     h->nResizes += 1;
 
-    CrashIf(h->nUsed >= (h->nEntries * 3) / 2);
+    ReportIf(h->nUsed >= (h->nEntries * 3) / 2);
 }
 
 // micro optimization: this is called often, so we want this check inlined. Resizing logic
@@ -198,7 +198,7 @@ static bool RemoveEntry(HashTable* h, HasherComparator* hc, uintptr_t key, uintp
     e->next = h->freeList;
     h->freeList = e;
     *removedValOut = e->val;
-    CrashIf(0 == h->nUsed);
+    ReportIf(0 == h->nUsed);
     h->nUsed -= 1;
     return true;
 }
diff --git a/src/utils/DirIter.cpp b/src/utils/DirIter.cpp
index 15b216c5ce8..01b984f8760 100644
--- a/src/utils/DirIter.cpp
+++ b/src/utils/DirIter.cpp
@@ -39,7 +39,7 @@ static bool IsSpecialDir(const char* s) {
 
 // if cb returns false, we stop further traversal
 bool VisitDir(const char* dir, u32 flg, const VisitDirCb& cb) {
-    CrashIf(flg == 0);
+    ReportIf(flg == 0);
     bool includeFiles = flg & kVisitDirIncudeFiles;
     bool includeDirs = flg & kVisitDirIncludeDirs;
     bool recur = flg & kVisitDirRecurse;
@@ -144,7 +144,7 @@ struct DirTraverseThreadData {
 
 static DWORD WINAPI DirTraverseThread(LPVOID data) {
     DirTraverseThreadData* td = (DirTraverseThreadData*)data;
-    CrashIf(!td);
+    ReportIf(!td);
 
     DirTraverse(td->dir, td->recurse, [td](WIN32_FIND_DATAW*, const char* path) -> bool {
         td->queue->Append(path);
diff --git a/src/utils/Dpi.cpp b/src/utils/Dpi.cpp
index 358aa06f865..02261c244af 100755
--- a/src/utils/Dpi.cpp
+++ b/src/utils/Dpi.cpp
@@ -47,7 +47,7 @@ int DpiGetForHwnd(HWND hwnd) {
         uint dpi = DynGetDpiForWindow(hwnd);
         // returns 0 for HWND_DESKTOP
         if (dpi > 0) {
-            CrashIf(dpi < 72);
+            ReportIf(dpi < 72);
             return (int)dpi;
         }
     }
diff --git a/src/utils/FileUtil.cpp b/src/utils/FileUtil.cpp
index 9d33fd1496d..d433201343c 100644
--- a/src/utils/FileUtil.cpp
+++ b/src/utils/FileUtil.cpp
@@ -509,7 +509,7 @@ TempStr GetPathOfFileInAppDirTemp(const char* fileName) {
 namespace file {
 
 FILE* OpenFILE(const char* path) {
-    CrashIf(!path);
+    ReportIf(!path);
     if (!path) {
         return nullptr;
     }
@@ -560,7 +560,7 @@ ByteSlice ReadFileWithAllocator(const char* filePath, Allocator* allocator) {
         // either way shouldn't happen because we're reading the exact size of file
         // I've seen this in crash reports so maybe the files are over-written
         // between the time I do fseek() and fread()
-        CrashIf(!(isEof || (err != 0)));
+        ReportIf(!(isEof || (err != 0)));
         goto Error;
     }
 
@@ -590,7 +590,7 @@ bool WriteFile(const char* path, const ByteSlice& d) {
 
     DWORD size = 0;
     BOOL ok = WriteFile(h, data, (DWORD)dataLen, &size, nullptr);
-    CrashIf(ok && (dataLen != (size_t)size));
+    ReportIf(ok && (dataLen != (size_t)size));
     return ok && dataLen == (size_t)size;
 }
 
@@ -618,7 +618,7 @@ bool Exists(const char* path) {
 
 // returns -1 on error (can't use INVALID_FILE_SIZE because it won't cast right)
 i64 GetSize(const char* path) {
-    CrashIf(!path);
+    ReportIf(!path);
     if (!path) {
         return -1;
     }
diff --git a/src/utils/FileWatcher.cpp b/src/utils/FileWatcher.cpp
index fe96cc24d9c..3320f4cb3b0 100644
--- a/src/utils/FileWatcher.cpp
+++ b/src/utils/FileWatcher.cpp
@@ -212,7 +212,7 @@ static void CALLBACK ReadDirectoryChangesNotification(DWORD errCode, DWORD bytes
 
     // logf("ReadDirectoryChangesNotification() dir: %s, numBytes: %d\n", wd->dirPath, (int)bytesTransfered);
 
-    CrashIf(wd != wd->overlapped.data);
+    ReportIf(wd != wd->overlapped.data);
 
     if (errCode == ERROR_OPERATION_ABORTED) {
         // logf("ReadDirectoryChangesNotification: ERROR_OPERATION_ABORTED\n");
@@ -274,7 +274,7 @@ static void CALLBACK StartMonitoringDirForChangesAPC(ULONG_PTR arg) {
         logf("StartMonitoringDirForChangesAPC() %s\n", wd->dirPath);
     }
 
-    CrashIf(gThreadId != GetCurrentThreadId());
+    ReportIf(gThreadId != GetCurrentThreadId());
 
     DWORD dwNotifyFilter = FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_FILE_NAME;
     ReadDirectoryChangesW(wd->hDir,
@@ -344,7 +344,7 @@ static DWORD WINAPI FileWatcherThread(void*) {
             // logf("FileWatcherThread(): gThreadControlHandle signalled\n");
         } else {
             logf("FileWatcherThread(): n=%d\n", n);
-            CrashIf(true);
+            ReportIf(true);
         }
     }
     DestroyTempAllocator();
@@ -492,7 +492,7 @@ static void RemoveWatchedDirIfNotReferenced(WatchedDir* wd) {
     }
 
     bool ok = ListRemove(&gWatchedDirs, wd);
-    CrashIf(!ok);
+    ReportIf(!ok);
     // memory will be eventually freed in ReadDirectoryChangesNotification()
     InterlockedIncrement(&gRemovalsPending);
     QueueUserAPC(StopMonitoringDirAPC, gThreadHandle, (ULONG_PTR)wd);
@@ -501,8 +501,8 @@ static void RemoveWatchedDirIfNotReferenced(WatchedDir* wd) {
 void FileWatcherWaitForShutdown() {
     // this is meant to be called at the end so we shouldn't
     // have any file watching subscriptions pending
-    CrashIf(gWatchedFiles != nullptr);
-    CrashIf(gWatchedDirs != nullptr);
+    ReportIf(gWatchedFiles != nullptr);
+    ReportIf(gWatchedDirs != nullptr);
     QueueUserAPC(ExitMonitoringThread, gThreadHandle, (ULONG_PTR)0);
 
     // wait for ReadDirectoryChangesNotification() process actions triggered
@@ -524,7 +524,7 @@ void FileWatcherWaitForShutdown() {
 static void RemoveWatchedFile(WatchedFile* wf) {
     WatchedDir* wd = wf->watchedDir;
     bool ok = ListRemove(&gWatchedFiles, wf);
-    CrashIf(!ok);
+    ReportIf(!ok);
 
     bool needsAwakeThread = wf->isManualCheck;
     DeleteWatchedFile(wf);
@@ -539,7 +539,7 @@ void FileWatcherUnsubscribe(WatchedFile* wf) {
     if (!wf) {
         return;
     }
-    CrashIf(!gThreadHandle);
+    ReportIf(!gThreadHandle);
 
     ScopedCritSec cs(&gThreadCritSec);
 
diff --git a/src/utils/GdiPlusUtil.cpp b/src/utils/GdiPlusUtil.cpp
index 8729880afc2..43b591322e2 100644
--- a/src/utils/GdiPlusUtil.cpp
+++ b/src/utils/GdiPlusUtil.cpp
@@ -41,7 +41,7 @@ Gdiplus::RectF RectToRectF(const Gdiplus::Rect r) {
 // Doesn't seem to be any different than MeasureTextAccurate() i.e. it still
 // underreports the width
 RectF MeasureTextAccurate2(Graphics* g, Font* f, const WCHAR* s, int len) {
-    CrashIf(0 >= len);
+    ReportIf(0 >= len);
     FixedArray<Region, 1024> regionBuf(len);
     Region* r = regionBuf.Get();
     StringFormat sf(StringFormat::GenericTypographic());
@@ -55,7 +55,7 @@ RectF MeasureTextAccurate2(Graphics* g, Font* f, const WCHAR* s, int len) {
     }
     sf.SetMeasurableCharacterRanges(len, charRanges);
     Status status = g->MeasureCharacterRanges(s, len, f, layoutRect, &sf, len, r);
-    CrashIf(status != Ok);
+    ReportIf(status != Ok);
     Gdiplus::RectF bbox;
     float maxDy = 0;
     float totalDx = 0;
@@ -101,7 +101,7 @@ RectF MeasureTextAccurate(Graphics* g, Font* f, const WCHAR* s, int len) {
             s2[256] = 0;
         }
         logf("MeasureTextAccurate: status: %d, font: %p, len: %d, s: '%s'\n", (int)status, f, len, s2);
-        // CrashIf(status != Ok);
+        // ReportIf(status != Ok);
     }
     Gdiplus::RectF bbox;
     r.GetBounds(&bbox, g);
@@ -120,7 +120,7 @@ RectF MeasureTextStandard(Graphics* g, Font* f, const WCHAR* s, int len) {
 }
 
 RectF MeasureTextQuick(Graphics* g, Font* f, const WCHAR* s, int len) {
-    CrashIf(0 >= len);
+    ReportIf(0 >= len);
 
     static Vec<Font*> fontCache;
     static Vec<bool> fixCache;
@@ -172,7 +172,7 @@ RectF MeasureText(Graphics* g, Font* f, const WCHAR* s, size_t len, TextMeasureA
     if (-1 == len || 0 == len) {
         len = str::Len(s);
     }
-    CrashIf((len == 0) || (len > INT_MAX));
+    ReportIf((len == 0) || (len > INT_MAX));
     if (algo) {
         return algo(g, f, s, (int)len);
     }
@@ -193,7 +193,7 @@ size_t StringLenForWidth(Graphics* g, Font* f, const WCHAR* s, size_t len, float
     }
     // make the best guess of the length that fits
     size_t n = (size_t)((dx / r.dx) * (float)len);
-    CrashIf((0 == n) || (n > len));
+    ReportIf((0 == n) || (n > len));
     r = MeasureText(g, f, s, n, algo);
     // find the length len of s that fits within dx iff width of len+1 exceeds dx
     int dir = 1; // increasing length
@@ -253,7 +253,7 @@ void GetBaseTransform(Matrix& m, Gdiplus::RectF pageRect, float zoom, int rotati
     } else if (0 == rotation) {
         m.Translate(0, 0, MatrixOrderAppend);
     } else {
-        CrashIf(true);
+        ReportIf(true);
     }
 
     m.Scale(zoom, zoom, MatrixOrderAppend);
@@ -330,7 +330,7 @@ static void MaybeFlipBitmap(Bitmap* bmp) {
         bmp->GetLastStatus(); // clear last status
         return;
     }
-    CrashIf(propSize > dimof(buf));
+    ReportIf(propSize > dimof(buf));
 
     auto status = bmp->GetPropertyItem(PropertyTagOrientation, propSize, (Gdiplus::PropertyItem*)buf);
     if (status != Status::Ok) {
@@ -425,7 +425,7 @@ static bool BmpSizeFromData(ByteReader r, Size& result) {
     }
     BITMAPINFOHEADER bmi;
     bool ok = r.UnpackLE(&bmi, sizeof(bmi), "3d2w6d", sizeof(BITMAPFILEHEADER));
-    CrashIf(!ok);
+    ReportIf(!ok);
     result.dx = bmi.biWidth;
     result.dy = bmi.biHeight;
     return true;
@@ -495,7 +495,7 @@ static bool TiffSizeFromData(ByteReader r, Size& result) {
         return false;
     }
     bool isBE = r.Byte(0) == 'M', isJXR = r.Byte(2) == 0xBC;
-    CrashIf(!isBE && r.Byte(0) != 'I' || isJXR && isBE);
+    ReportIf(!isBE && r.Byte(0) != 'I' || isJXR && isBE);
     const WORD WIDTH = isJXR ? 0xBC80 : 0x0100, HEIGHT = isJXR ? 0xBC81 : 0x0101;
     size_t idx = r.DWord(4, isBE);
     WORD count = idx <= r.len - 2 ? r.Word(idx, isBE) : 0;
diff --git a/src/utils/GeomUtil.cpp b/src/utils/GeomUtil.cpp
index 6d936876571..605054a3eb6 100644
--- a/src/utils/GeomUtil.cpp
+++ b/src/utils/GeomUtil.cpp
@@ -489,7 +489,7 @@ int NormalizeRotation(int rotation) {
         rotation -= 360;
     }
     if ((rotation % 90) != 0) {
-        CrashIf(true);
+        ReportIf(true);
         return 0;
     }
     return rotation;
diff --git a/src/utils/GuessFileType.cpp b/src/utils/GuessFileType.cpp
index eb73d54c482..cc9d91862b5 100644
--- a/src/utils/GuessFileType.cpp
+++ b/src/utils/GuessFileType.cpp
@@ -381,7 +381,7 @@ static bool IsFb2Archive(MultiFormatArchive* archive) {
 
 // detect file type based on file content
 Kind GuessFileTypeFromContent(const char* path) {
-    CrashIf(!path);
+    ReportIf(!path);
     if (path::IsDirectory(path)) {
         char* mimetypePath = path::JoinTemp(path, "mimetype");
         if (file::StartsWith(mimetypePath, "application/epub+zip")) {
diff --git a/src/utils/HtmlPrettyPrint.cpp b/src/utils/HtmlPrettyPrint.cpp
index b818804d97a..934d034786b 100644
--- a/src/utils/HtmlPrettyPrint.cpp
+++ b/src/utils/HtmlPrettyPrint.cpp
@@ -7,7 +7,7 @@
 #include "HtmlPullParser.h"
 
 static void HtmlAddWithNesting(str::Str* out, HtmlToken* tok, size_t nesting) {
-    CrashIf(!tok->IsStartTag() && !tok->IsEndTag() && !tok->IsEmptyElementEndTag());
+    ReportIf(!tok->IsStartTag() && !tok->IsEndTag() && !tok->IsEmptyElementEndTag());
     bool isInline = IsInlineTag(tok->tag);
     // add a newline before block start tags (unless there already is one)
     bool onNewLine = out->size() == 0 || out->Last() == '\n';
diff --git a/src/utils/HtmlPullParser.cpp b/src/utils/HtmlPullParser.cpp
index 3e415aa3e4a..b55e250c7db 100644
--- a/src/utils/HtmlPullParser.cpp
+++ b/src/utils/HtmlPullParser.cpp
@@ -174,7 +174,7 @@ const char* ResolveHtmlEntities(const char* s, const char* end, Allocator* alloc
         s = curr;
     }
     *dst = 0;
-    CrashIf(dst >= res + resLen);
+    ReportIf(dst >= res + resLen);
     return (const char*)res;
 }
 
@@ -205,7 +205,7 @@ static bool IsNameWithNS(const char* s, size_t sLen, const char* nameToCheck) {
     if (tmp) {
         sRealStart = tmp + 1;
         size_t prefixLen = sRealStart - s;
-        CrashIf(prefixLen > len);
+        ReportIf(prefixLen > len);
         len -= prefixLen;
     }
     return str::EqNIx(sRealStart, len, nameToCheck);
@@ -215,7 +215,7 @@ static bool IsNameWithNS(const char* s, size_t sLen, const char* nameToCheck) {
 // (i.e. succeeds for "xlink:href" with name="href" and any value of attrNS)
 // TODO: add proper namespace support
 bool AttrInfo::NameIsNS(const char* nameToCheck, const char*) const {
-    // CrashIf(!ns);
+    // ReportIf(!ns);
     return IsNameWithNS(name, nameLen, nameToCheck);
 }
 
@@ -253,7 +253,7 @@ bool HtmlToken::NameIs(const char* nameToFind) const {
 // (i.e. succeeds for "opf:content" with name="content" and any value of ns)
 // TODO: add proper namespace support
 bool HtmlToken::NameIsNS(const char* nameToCheck, const char*) const {
-    // CrashIf(!ns);
+    // ReportIf(!ns);
     //  nLen is 'nameLen' i.e. first nLen characters of s is a name
     return IsNameWithNS(s, nLen, nameToCheck);
 }
@@ -270,7 +270,7 @@ const char* HtmlToken::GetReparsePoint() const {
     if (IsText()) {
         return s;
     }
-    CrashIf(true); // don't call us on error tokens
+    ReportIf(true); // don't call us on error tokens
     return nullptr;
 }
 
@@ -417,7 +417,7 @@ HtmlToken* HtmlPullParser::Next() {
         return &currToken;
     }
 
-    CrashIf('>' != *currPos);
+    ReportIf('>' != *currPos);
     if (currPos == start || currPos == start + 1 && *start == '/') {
         // skip empty tags (</>), because we're lenient
         ++currPos;
diff --git a/src/utils/HtmlWindow.cpp b/src/utils/HtmlWindow.cpp
index 5c338051f1d..01732a11341 100644
--- a/src/utils/HtmlWindow.cpp
+++ b/src/utils/HtmlWindow.cpp
@@ -218,12 +218,12 @@ HtmlWindow* FindHtmlWindowById(int windowId) {
 static int GenNewWindowId(HtmlWindow* htmlWin) {
     int newWindowId = (int)gHtmlWindows.size();
     gHtmlWindows.Append(htmlWin);
-    CrashIf(htmlWin != FindHtmlWindowById(newWindowId));
+    ReportIf(htmlWin != FindHtmlWindowById(newWindowId));
     return newWindowId;
 }
 
 static void FreeWindowId(int windowId) {
-    CrashIf(nullptr == gHtmlWindows.at(windowId));
+    ReportIf(nullptr == gHtmlWindows.at(windowId));
     gHtmlWindows.at(windowId) = nullptr;
 }
 
@@ -283,7 +283,7 @@ class HW_IInternetProtocolInfo : public IInternetProtocolInfo {
 
 ULONG STDMETHODCALLTYPE HW_IInternetProtocolInfo::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -348,7 +348,7 @@ class HW_IInternetProtocol : public IInternetProtocol {
 
 ULONG STDMETHODCALLTYPE HW_IInternetProtocol::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -449,7 +449,7 @@ STDMETHODIMP HW_IInternetProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink* p
     // TODO: this now happens due to events happening on HtmlWindow
     // used to take a screenshot, so ignore it. Is there a way
     // to cancel things and not get her?
-    // CrashIf(!win);
+    // ReportIf(!win);
     if (!win) {
         return INET_E_OBJECT_NOT_FOUND;
     }
@@ -469,7 +469,7 @@ STDMETHODIMP HW_IInternetProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink* p
     pIProtSink->ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, mimeW);
 #ifdef _WIN64
     // not going to report data in parts for unexpectedly huge webpages
-    CrashIf(data.size() > ULONG_MAX);
+    ReportIf(data.size() > ULONG_MAX);
 #endif
     pIProtSink->ReportData(BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE,
                            (ULONG)data.size(), (ULONG)data.size());
@@ -528,7 +528,7 @@ class HW_IInternetProtocolFactory : public IClassFactory {
 
 STDMETHODIMP_(ULONG) HW_IInternetProtocolFactory::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -568,12 +568,12 @@ static void RegisterInternetProtocolFactory() {
 
     ScopedComPtr<IInternetSession> internetSession;
     HRESULT hr = CoInternetGetSession(0, &internetSession, 0);
-    CrashIf(FAILED(hr));
-    CrashIf(nullptr != gInternetProtocolFactory);
+    ReportIf(FAILED(hr));
+    ReportIf(nullptr != gInternetProtocolFactory);
     gInternetProtocolFactory = new HW_IInternetProtocolFactory();
     hr = internetSession->RegisterNameSpace(gInternetProtocolFactory, CLSID_HW_IInternetProtocol, HW_PROTO_PREFIX, 0,
                                             nullptr, 0);
-    CrashIf(FAILED(hr));
+    ReportIf(FAILED(hr));
 }
 
 static void UnregisterInternetProtocolFactory() {
@@ -583,10 +583,10 @@ static void UnregisterInternetProtocolFactory() {
     }
     ScopedComPtr<IInternetSession> internetSession;
     HRESULT hr = CoInternetGetSession(0, &internetSession, 0);
-    CrashIf(FAILED(hr));
+    ReportIf(FAILED(hr));
     internetSession->UnregisterNameSpace(gInternetProtocolFactory, HW_PROTO_PREFIX);
     ULONG refCount = gInternetProtocolFactory->Release();
-    CrashIf(refCount != 0);
+    ReportIf(refCount != 0);
     gInternetProtocolFactory = nullptr;
 }
 
@@ -1129,7 +1129,7 @@ class HW_IDownloadManager : public IDownloadManager {
     }
     ULONG STDMETHODCALLTYPE Release() override {
         LONG res = InterlockedDecrement(&refCount);
-        CrashIf(res < 0);
+        ReportIf(res < 0);
         if (0 == res) {
             delete this;
         }
@@ -1370,7 +1370,7 @@ ULONG STDMETHODCALLTYPE HtmlMoniker::AddRef() {
 
 ULONG STDMETHODCALLTYPE HtmlMoniker::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
@@ -1431,10 +1431,10 @@ static LRESULT CALLBACK WndProcParent2(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp
 }
 
 void HtmlWindow::SubclassHwnd() {
-    CrashIf(subclassId); // don't subclass multiple times
+    ReportIf(subclassId); // don't subclass multiple times
     subclassId = NextSubclassId();
     BOOL ok = SetWindowSubclass(hwndParent, WndProcParent2, subclassId, (DWORD_PTR)this);
-    CrashIf(!ok);
+    ReportIf(!ok);
 }
 
 void HtmlWindow::UnsubclassHwnd() {
@@ -1446,7 +1446,7 @@ void HtmlWindow::UnsubclassHwnd() {
 }
 
 HtmlWindow::HtmlWindow(HWND parent, HtmlWindowCallback* cb) {
-    CrashIf(!parent);
+    ReportIf(!parent);
     hwndParent = parent;
     htmlWinCb = cb;
     RegisterInternetProtocolFactory();
@@ -1490,7 +1490,7 @@ bool HtmlWindow::CreateBrowser() {
     ScopedComQIPtr<IPersistStreamInit> psInit(p);
     if (psInit) {
         hr = psInit->InitNew();
-        CrashIf(!SUCCEEDED(hr));
+        ReportIf(!SUCCEEDED(hr));
     }
 
     hr = p->QueryInterface(&oleInPlaceObject);
@@ -1657,7 +1657,7 @@ int HtmlWindow::GetZoomPercent() {
         return 100;
     }
     int zoom = vtOut.lVal;
-    CrashIf(zoomDPI < 96);
+    ReportIf(zoomDPI < 96);
     zoom = (zoom * 96) / zoomDPI; // undo what we do in SetZoomPercent()
     return zoom;
 }
@@ -1665,7 +1665,7 @@ int HtmlWindow::GetZoomPercent() {
 void HtmlWindow::SetZoomPercent(int zoom) {
     VARIANT vtIn{};
     VARIANT vtOut{};
-    CrashIf(zoomDPI < 96);
+    ReportIf(zoomDPI < 96);
     zoom = (zoom * zoomDPI) / 96;
     VariantSetLong(&vtIn, zoom);
     webBrowser->ExecWB(OLECMDID_OPTICAL_ZOOM, OLECMDEXECOPT_DONTPROMPTUSER, &vtIn, &vtOut);
@@ -1732,7 +1732,7 @@ void HtmlWindow::SetHtmlReal(const ByteSlice& d) {
     }
     ScopedComQIPtr<IMoniker> htmlMon(htmlContent);
     hr = perstMon->Load(TRUE, htmlMon, nullptr, STGM_READ);
-    CrashIf(FAILED(hr));
+    ReportIf(FAILED(hr));
 }
 
 // http://stackoverflow.com/questions/9778206/how-i-can-get-information-about-the-scrollbars-of-an-webbrowser-control-instance
@@ -1764,7 +1764,7 @@ void HtmlWindow::SetScrollbarToAuto() {
 
     BSTR s = SysAllocString(L"auto");
     hr = body->put_scroll(s);
-    CrashIf(FAILED(hr));
+    ReportIf(FAILED(hr));
     SysFreeString(s);
 }
 
@@ -1828,7 +1828,7 @@ bool HtmlWindow::OnBeforeNavigate(const WCHAR* urlW, bool newWindow) {
     int protoWindowId;
     AutoFreeStr urlReal = str::Dup(url);
     bool ok = ParseProtoUrl(url, &protoWindowId, &urlReal);
-    CrashIf(ok && (protoWindowId != windowId));
+    ReportIf(ok && (protoWindowId != windowId));
     bool shouldNavigate = htmlWinCb->OnBeforeNavigate(urlReal, newWindow);
     return shouldNavigate;
 }
@@ -1864,7 +1864,7 @@ void HtmlWindow::OnDocumentComplete(const WCHAR* urlW) {
     int protoWindowId;
     AutoFreeStr urlReal = str::Dup(url);
     bool ok = ParseProtoUrl(url, &protoWindowId, &urlReal);
-    CrashIf(ok && (protoWindowId != windowId));
+    ReportIf(ok && (protoWindowId != windowId));
 
     currentURL.Set(urlReal.StealData());
     if (htmlWinCb) {
@@ -2003,7 +2003,7 @@ STDMETHODIMP FrameSite::QueryInterface(REFIID riid, void** ppv) {
 
 ULONG STDMETHODCALLTYPE FrameSite::Release() {
     LONG res = InterlockedDecrement(&refCount);
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     if (0 == res) {
         delete this;
     }
diff --git a/src/utils/Log.cpp b/src/utils/Log.cpp
index 55f324a82bd..bbdab27154e 100644
--- a/src/utils/Log.cpp
+++ b/src/utils/Log.cpp
@@ -205,7 +205,7 @@ void logfa(const char* fmt, ...) {
 }
 
 void StartLogToFile(const char* path, bool removeIfExists) {
-    CrashIf(gLogFilePath);
+    ReportIf(gLogFilePath);
     gLogFilePath = str::Dup(path);
     if (removeIfExists) {
         remove(path);
diff --git a/src/utils/ScopedWin.h b/src/utils/ScopedWin.h
index a1327e0009c..ef91e568b65 100644
--- a/src/utils/ScopedWin.h
+++ b/src/utils/ScopedWin.h
@@ -28,8 +28,8 @@ class AutoCloseHandle {
     }
 
     AutoCloseHandle& operator=(HANDLE h) {
-        CrashIf(handle != nullptr);
-        CrashIf(h == nullptr);
+        ReportIf(handle != nullptr);
+        ReportIf(h == nullptr);
         handle = h;
         return *this;
     }
@@ -59,7 +59,7 @@ class ScopedComPtr {
         }
     }
     bool Create(const CLSID clsid) {
-        CrashIf(ptr);
+        ReportIf(ptr);
         if (ptr) {
             return false;
         }
@@ -107,7 +107,7 @@ class ScopedComQIPtr {
         }
     }
     bool Create(const CLSID clsid) {
-        CrashIf(ptr);
+        ReportIf(ptr);
         if (ptr)
             return false;
         HRESULT hr = CoCreateInstance(clsid, nullptr, CLSCTX_ALL, IID_PPV_ARGS(&ptr));
diff --git a/src/utils/SettingsUtil.cpp b/src/utils/SettingsUtil.cpp
index 23b5b7428e9..6a6ad248a04 100644
--- a/src/utils/SettingsUtil.cpp
+++ b/src/utils/SettingsUtil.cpp
@@ -33,7 +33,7 @@ static bool NeedsEscaping(const char* s) {
 }
 
 static void EscapeStr(str::Str& out, const char* s) {
-    CrashIf(!NeedsEscaping(s));
+    ReportIf(!NeedsEscaping(s));
     if (str::IsWs(*s) && *s != '\n' && *s != '\r') {
         out.AppendChar('$');
     }
@@ -210,7 +210,7 @@ static bool SerializeField(str::Str& out, const u8* base, const FieldInfo& field
         case SettingType::String:
         case SettingType::Color:
             if (!*(const char**)fieldPtr) {
-                CrashIf(field.value);
+                ReportIf(field.value);
                 return false; // skip empty strings
             }
             if (!NeedsEscaping(*(const char**)fieldPtr)) {
@@ -220,7 +220,7 @@ static bool SerializeField(str::Str& out, const u8* base, const FieldInfo& field
             }
             return true;
         case SettingType::Compact:
-            CrashIf(!IsCompactable(GetSubstruct(field)));
+            ReportIf(!IsCompactable(GetSubstruct(field)));
             for (size_t i = 0; i < GetSubstruct(field)->fieldCount; i++) {
                 if (i > 0) {
                     out.AppendChar(' ');
@@ -254,7 +254,7 @@ static bool SerializeField(str::Str& out, const u8* base, const FieldInfo& field
             // prevent empty arrays from being replaced with the defaults
             return (*(Vec<char*>**)fieldPtr)->size() > 0 || field.value != 0;
         default:
-            CrashIf(true);
+            ReportIf(true);
             return false;
     }
 }
@@ -313,7 +313,7 @@ static void DeserializeField(const FieldInfo& field, u8* base, const char* value
             }
             break;
         case SettingType::Compact:
-            CrashIf(!IsCompactable(GetSubstruct(field)));
+            ReportIf(!IsCompactable(GetSubstruct(field)));
             for (size_t i = 0; i < GetSubstruct(field)->fieldCount; i++) {
                 if (value) {
                     for (; str::IsWs(*value); value++) {
@@ -363,7 +363,7 @@ static void DeserializeField(const FieldInfo& field, u8* base, const char* value
             }
             break;
         default:
-            CrashIf(true);
+            ReportIf(true);
     }
 }
 
@@ -421,8 +421,8 @@ static void SerializeStructRec(str::Str& out, const StructInfo* info, const void
     const char* fieldName = info->fieldNames;
     for (size_t i = 0; i < info->fieldCount; i++, fieldName += str::Len(fieldName) + 1) {
         const FieldInfo& field = info->fields[i];
-        CrashIf(str::FindChar(fieldName, '=') || str::FindChar(fieldName, ':') || str::FindChar(fieldName, '[') ||
-                str::FindChar(fieldName, ']') || NeedsEscaping(fieldName));
+        ReportIf(str::FindChar(fieldName, '=') || str::FindChar(fieldName, ':') || str::FindChar(fieldName, '[') ||
+                 str::FindChar(fieldName, ']') || NeedsEscaping(fieldName));
         if (SettingType::Struct == field.type || SettingType::Prerelease == field.type) {
 #if !(defined(PRE_RELEASE_VER) || defined(DEBUG))
             if (SettingType::Prerelease == field.type) {
diff --git a/src/utils/SquareTreeParser.cpp b/src/utils/SquareTreeParser.cpp
index 3873b78483a..6b8ba518bbe 100644
--- a/src/utils/SquareTreeParser.cpp
+++ b/src/utils/SquareTreeParser.cpp
@@ -223,5 +223,5 @@ SquareTree::SquareTree(const char* data) : root(nullptr) {
 
     char* start = dataUtf8.Get();
     root = ParseSquareTreeRec(start, true);
-    CrashIf(*start || !root);
+    ReportIf(*start || !root);
 }
diff --git a/src/utils/StrFormat.cpp b/src/utils/StrFormat.cpp
index cd583d3bf50..1bb53de54c4 100644
--- a/src/utils/StrFormat.cpp
+++ b/src/utils/StrFormat.cpp
@@ -40,7 +40,7 @@ static void addRawStr(Fmt& fmt, const char* s, size_t len) {
     if (len == 0) {
         return;
     }
-    CrashIf(fmt.nInst >= dimof(fmt.instructions));
+    ReportIf(fmt.nInst >= dimof(fmt.instructions));
     auto& i = fmt.instructions[fmt.nInst++];
     i.t = Type::RawStr;
     i.s = s;
@@ -50,12 +50,12 @@ static void addRawStr(Fmt& fmt, const char* s, size_t len) {
 
 // parse: {$n}
 static const char* parseArgDefPositional(Fmt& fmt, const char* s) {
-    CrashIf(*s != '{');
+    ReportIf(*s != '{');
     ++s;
     int n = 0;
     while (*s != '}') {
         // TODO: this could be more featurful
-        CrashIf(!str::IsDigit(*s));
+        ReportIf(!str::IsDigit(*s));
         n = n * 10 + (*s - '0');
         ++s;
     }
@@ -96,7 +96,7 @@ static bool isFmtChar(char c) {
 
 // parse: %[<fmt>][csfd]
 static const char* parseArgDefPerc(Fmt& fmt, const char* s) {
-    CrashIf(*s != '%');
+    ReportIf(*s != '%');
     s++;
     const char* fmtStart = s;
     while (*s && isFmtChar(*s)) {
@@ -121,13 +121,13 @@ static const char* parseArgDefPerc(Fmt& fmt, const char* s) {
             n--;
         }
     }
-    CrashIf(n > 1); // TODO: only support a single digit for nLen
+    ReportIf(n > 1); // TODO: only support a single digit for nLen
     if (n > 0) {
         c = *fmtStart++;
         if (c >= '0' && c <= '9') {
             i.width = c - '0';
         } else {
-            CrashIf(true);
+            ReportIf(true);
         }
     }
     return s;
@@ -223,7 +223,7 @@ static bool ParseFormat(Fmt& o, const char* fmt) {
     // but must cover all space from 0..nArgsExpected
     for (int i = 0; i <= maxArgNo; i++) {
         bool isOk = hasInstructionWithArgNo(o.instructions, o.nInst, i);
-        CrashIf(!isOk);
+        ReportIf(!isOk);
         if (!isOk) {
             return false;
         }
@@ -238,11 +238,11 @@ bool Fmt::Eval(const Arg** args, int nArgs) {
     }
 
     for (int n = 0; n < nInst; n++) {
-        CrashIf(n >= dimof(instructions));
+        ReportIf(n >= dimof(instructions));
 
         auto& inst = instructions[n];
         int argNo = inst.argNo;
-        CrashIf(argNo >= nArgs);
+        ReportIf(argNo >= nArgs);
         if (argNo >= nArgs) {
             isOk = false;
             return false;
@@ -255,7 +255,7 @@ bool Fmt::Eval(const Arg** args, int nArgs) {
 
         const Arg& arg = *args[argNo];
         isOk = validArgTypes(inst.t, arg.t);
-        CrashIf(!isOk);
+        ReportIf(!isOk);
         if (!isOk) {
             return false;
         }
@@ -276,7 +276,7 @@ bool Fmt::Eval(const Arg** args, int nArgs) {
                     f[i++] = '0' + (char)inst.width;
                 }
                 f[i++] = 'd';
-                CrashIf(i >= dimof(f));
+                ReportIf(i >= dimof(f));
                 str::BufFmt(buf, dimof(buf), f, (int)arg.u.i);
                 res.Append(buf);
             } break;
@@ -298,7 +298,7 @@ bool Fmt::Eval(const Arg** args, int nArgs) {
                 res.Append(s);
                 break;
             default:
-                CrashIf(true);
+                ReportIf(true);
                 break;
         };
     }
@@ -314,7 +314,7 @@ char* Format(const char* s, const Arg& a1, const Arg& a2, const Arg& a3, const A
     args[nArgs++] = &a4;
     args[nArgs++] = &a5;
     args[nArgs++] = &a6;
-    CrashIf(nArgs > dimof(args));
+    ReportIf(nArgs > dimof(args));
     // arguments at the end could be empty
     while (nArgs > 0 && args[nArgs - 1]->t == Type::None) {
         nArgs--;
@@ -373,7 +373,7 @@ char* FormatTemp(const char* s, const Arg& a1, const Arg& a2, const Arg& a3, con
     args[nArgs++] = &a4;
     args[nArgs++] = &a5;
     args[nArgs++] = &a6;
-    CrashIf(nArgs > dimof(args));
+    ReportIf(nArgs > dimof(args));
     return FormatTemp(s, args, nArgs);
 }
 
diff --git a/src/utils/StrQueue.cpp b/src/utils/StrQueue.cpp
index a4111b15f74..958820c6d3d 100644
--- a/src/utils/StrQueue.cpp
+++ b/src/utils/StrQueue.cpp
@@ -26,7 +26,7 @@ void StrQueue::Unlock() {
 
 void StrQueue::MarkFinished() {
     Lock();
-    CrashIf(isFinished);
+    ReportIf(isFinished);
     isFinished = true;
     Unlock();
     SetEvent(hEvent);
diff --git a/src/utils/StrUtil.cpp b/src/utils/StrUtil.cpp
index ae6cb6e72fb..8973aa2ef6b 100644
--- a/src/utils/StrUtil.cpp
+++ b/src/utils/StrUtil.cpp
@@ -189,7 +189,7 @@ bool IsEqual(const ByteSlice& d1, const ByteSlice& d2) {
     if (d1.sz == 0) {
         return true;
     }
-    CrashIf(!d1.d || !d2.d);
+    ReportIf(!d1.d || !d2.d);
     int res = memcmp(d1.d, d2.d, d1.sz);
     return res == 0;
 }
@@ -666,7 +666,7 @@ char* FmtVWithAllocator(Allocator* a, const char* fmt, va_list args) {
         int count = vsnprintf(buf, (size_t)bufCchSize, fmt, args);
         // happened in https://github.com/sumatrapdfreader/sumatrapdf/issues/878
         // when %S string had certain Unicode characters
-        CrashIf(count == -1);
+        ReportIf(count == -1);
         if (count < 0) {
             str::BufSet(buf, bufCchSize, "vsnprintf() returned -1");
             break;
@@ -1255,7 +1255,7 @@ int StrToIdxIS(SeqStrings strs, const char* toFind) {
 // Given an index in the "array" of sequentially laid out strings,
 // returns a strings at that index.
 const char* IdxToStr(SeqStrings strs, int idx) {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     const char* s = strs;
     while (idx > 0) {
         Next(s);
@@ -1324,7 +1324,7 @@ static char* EnsureCap(Str* s, size_t needed) {
 }
 
 static char* MakeSpaceAt(Str* s, size_t idx, size_t count) {
-    CrashIf(count == 0);
+    ReportIf(count == 0);
     u32 newLen = std::max(s->len, (u32)idx) + (u32)count;
     char* buf = EnsureCap(s, newLen);
     if (!buf) {
@@ -1409,22 +1409,22 @@ Str::~Str() {
 }
 
 char& Str::at(size_t idx) const {
-    CrashIf(idx >= (u32)len);
+    ReportIf(idx >= (u32)len);
     return els[idx];
 }
 
 char& Str::at(int idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return at((size_t)idx);
 }
 
 char& Str::operator[](long idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return at((size_t)idx);
 }
 
 char& Str::operator[](int idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return at((size_t)idx);
 }
 
@@ -1499,7 +1499,7 @@ char Str::RemoveLast() {
 }
 
 char& Str::Last() const {
-    CrashIf(0 == len);
+    ReportIf(0 == len);
     return at(len - 1);
 }
 
@@ -1674,7 +1674,7 @@ static WCHAR* EnsureCap(WStr* s, size_t needed) {
 }
 
 static WCHAR* MakeSpaceAt(WStr* s, size_t idx, size_t count) {
-    CrashIf(count == 0);
+    ReportIf(count == 0);
     u32 newLen = std::max(s->len, (u32)idx) + (u32)count;
     WCHAR* buf = EnsureCap(s, newLen);
     if (!buf) {
@@ -1757,12 +1757,12 @@ WStr::~WStr() {
 }
 
 WCHAR& WStr::at(size_t idx) const {
-    CrashIf(idx >= len);
+    ReportIf(idx >= len);
     return els[idx];
 }
 
 WCHAR& WStr::at(int idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return at((size_t)idx);
 }
 
@@ -1771,7 +1771,7 @@ WCHAR& WStr::operator[](size_t idx) const {
 }
 
 WCHAR& WStr::operator[](long idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return at((size_t)idx);
 }
 
@@ -1780,7 +1780,7 @@ WCHAR& WStr::operator[](ULONG idx) const {
 }
 
 WCHAR& WStr::operator[](int idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return at((size_t)idx);
 }
 
@@ -1849,7 +1849,7 @@ WCHAR WStr::RemoveLast() {
 }
 
 WCHAR& WStr::Last() const {
-    CrashIf(0 == len);
+    ReportIf(0 == len);
     return at(len - 1);
 }
 
@@ -2294,7 +2294,7 @@ int BufSet(char* dst, int cchDst, const char* src) {
     int toCopy = std::min(cchDst - 1, srcCchSize);
 
     errno_t err = strncpy_s(dst, (size_t)cchDst, src, (size_t)toCopy);
-    CrashIf(err || dst[toCopy] != '\0');
+    ReportIf(err || dst[toCopy] != '\0');
 
     return toCopy;
 }
@@ -2330,7 +2330,7 @@ int BufAppend(WCHAR* dst, int cchDst, const WCHAR* s) {
     int toCopy = std::min(left, srcCchSize);
 
     errno_t err = wcsncat_s(dst, cchDst, s, toCopy);
-    CrashIf(err || dst[currDstCchLen + toCopy] != '\0');
+    ReportIf(err || dst[currDstCchLen + toCopy] != '\0');
 
     return toCopy;
 }
@@ -2349,7 +2349,7 @@ int BufAppend(char* dst, int dstCch, const char* s) {
     int toCopy = std::min(left, srcCchSize);
 
     errno_t err = strncat_s(dst, dstCch, s, toCopy);
-    CrashIf(err || dst[currDstCchLen + toCopy] != '\0');
+    ReportIf(err || dst[currDstCchLen + toCopy] != '\0');
 
     return toCopy;
 }
diff --git a/src/utils/StrVec.cpp b/src/utils/StrVec.cpp
index b8f24d004e4..f2dd345b3d1 100644
--- a/src/utils/StrVec.cpp
+++ b/src/utils/StrVec.cpp
@@ -136,7 +136,7 @@ int StrVecPage::BytesLeft() {
     int cbTotal = (int)(currEnd - start);
     int cbOffsets = cbOffsetsSize(nStrings);
     auto res = cbTotal - cbOffsets;
-    CrashIf(res < 0);
+    ReportIf(res < 0);
     return res;
 }
 
@@ -153,7 +153,7 @@ static StrVecPage* AllocStrVecPage(int pageSize) {
 #define kNoSpace (char*)-2
 
 u32* OffsetsForString(const StrVecPage* p, int idx) {
-    CrashIf(idx < 0 || idx > p->nStrings);
+    ReportIf(idx < 0 || idx > p->nStrings);
     char* start = (char*)p;
     u32* offsets = (u32*)(start + kStrVecPageHdrSize);
     return offsets + (idx * 2);
@@ -161,7 +161,7 @@ u32* OffsetsForString(const StrVecPage* p, int idx) {
 
 // must have enough space
 static char* AppendJustString(StrVecPage* p, const char* s, int sLen, int idx) {
-    CrashIf(!s);
+    ReportIf(!s);
     u32* offsets = OffsetsForString(p, idx);
     char* dst = p->currEnd - sLen - 1; // 1 for zero termination
     u32 off = (u32)(dst - (char*)p);
@@ -207,7 +207,7 @@ char* StrVecPage::SetAt(int idx, const char* s, int sLen) {
 }
 
 char* StrVecPage::InsertAt(int idx, const char* s, int sLen) {
-    CrashIf(idx < 0 || idx > nStrings);
+    ReportIf(idx < 0 || idx > nStrings);
 
     int cbNeeded = sizeof(u32) * 2; // for offset / size
     if (s) {
@@ -310,7 +310,7 @@ static void FreePages(StrVecPage* toFree) {
 
 static StrVecPage* CompactStrVecPages(StrVecPage* first, int extraSize) {
     if (!first) {
-        CrashIf(extraSize > 0);
+        ReportIf(extraSize > 0);
         return nullptr;
     }
     int nStrings = 0;
@@ -352,7 +352,7 @@ static void CompactPages(StrVec* v, int extraSize) {
     auto first = CompactStrVecPages(v->first, extraSize);
     FreePages(v->first);
     v->first = first;
-    CrashIf(first && (v->size != first->nStrings));
+    ReportIf(first && (v->size != first->nStrings));
 }
 
 void StrVec::Reset(StrVecPage* initWith) {
@@ -411,10 +411,10 @@ static StrVecPage* AllocatePage(StrVec* v, StrVecPage* last, int nBytesNeeded) {
     }
     auto page = AllocStrVecPage(pageSize);
     if (last) {
-        CrashIf(!v->first);
+        ReportIf(!v->first);
         last->next = page;
     } else {
-        CrashIf(v->first);
+        ReportIf(v->first);
         v->first = page;
     }
     return page;
@@ -484,7 +484,7 @@ char* StrVec::SetAt(int idx, const char* s, int sLen) {
     int extraSpace = RoundUp(sLen + 1, 2048);
     CompactPages(this, extraSpace);
     char* res = first->SetAt(idx, s, sLen);
-    CrashIf(res == kNoSpace);
+    ReportIf(res == kNoSpace);
     return res;
 }
 
@@ -510,7 +510,7 @@ char* StrVec::InsertAt(int idx, const char* s, int sLen) {
     int extraSpace = RoundUp(sLen + 1, 2048);
     CompactPages(this, extraSpace);
     char* res = first->InsertAt(idx, s, sLen);
-    CrashIf(res == kNoSpace);
+    ReportIf(res == kNoSpace);
     return res;
 }
 
@@ -553,7 +553,7 @@ StrSpan StrVec::AtSpan(int idx) const {
 }
 
 char* StrVec::operator[](int idx) const {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     return At(idx);
 }
 
@@ -656,8 +656,8 @@ void Sort(StrVec& v, StrLessFunc lessFn) {
     if (v.Size() == 0) {
         return;
     }
-    CrashIf(!v.first);
-    CrashIf(v.first->next);
+    ReportIf(!v.first);
+    ReportIf(v.first->next);
     int n = v.Size();
 
     const char* pageStart = (const char*)v.first;
diff --git a/src/utils/StrconvUtil.cpp b/src/utils/StrconvUtil.cpp
index a5e2a460547..825b12b6092 100644
--- a/src/utils/StrconvUtil.cpp
+++ b/src/utils/StrconvUtil.cpp
@@ -62,7 +62,7 @@ char* WStrToUtf8(const WCHAR* s, size_t cch, Allocator* a) {
 
 // caller needs to free() the result
 WCHAR* StrToWStr(const char* src, uint codePage, int cbSrc) {
-    CrashIf(!src);
+    ReportIf(!src);
     if (!src) {
         return nullptr;
     }
@@ -80,7 +80,7 @@ WCHAR* StrToWStr(const char* src, uint codePage, int cbSrc) {
 }
 
 TempStr ToMultiByteTemp(const char* src, uint codePageSrc, uint codePageDest) {
-    CrashIf(!src);
+    ReportIf(!src);
     if (!src) {
         return nullptr;
     }
diff --git a/src/utils/TempAllocator.cpp b/src/utils/TempAllocator.cpp
index 219392320dd..a42621e09ed 100644
--- a/src/utils/TempAllocator.cpp
+++ b/src/utils/TempAllocator.cpp
@@ -118,7 +118,7 @@ TempStr ReplaceTemp(const char* s, const char* toReplace, const char* replaceWit
 
 TempStr ToUtf8Temp(const WCHAR* s, size_t cch) {
     if (!s) {
-        CrashIf((int)cch > 0);
+        ReportIf((int)cch > 0);
         return nullptr;
     }
     return strconv::WStrToUtf8(s, cch, GetTempAllocator());
@@ -126,7 +126,7 @@ TempStr ToUtf8Temp(const WCHAR* s, size_t cch) {
 
 TempWStr ToWStrTemp(const char* s, size_t cb) {
     if (!s) {
-        CrashIf((int)cb > 0);
+        ReportIf((int)cb > 0);
         return nullptr;
     }
     return strconv::Utf8ToWStr(s, cb, GetTempAllocator());
diff --git a/src/utils/TgaReader.cpp b/src/utils/TgaReader.cpp
index b740e1c62db..57de2483fa2 100644
--- a/src/utils/TgaReader.cpp
+++ b/src/utils/TgaReader.cpp
@@ -211,7 +211,7 @@ static void SetImageProperty(Gdiplus::Bitmap* bmp, PROPID id, const char* asciiV
     item.value = (void*)asciiValue;
     item.length = (ULONG)(str::Len(asciiValue) + 1);
     Gdiplus::Status ok = bmp->SetPropertyItem(&item);
-    CrashIf(ok != Gdiplus::Ok);
+    ReportIf(ok != Gdiplus::Ok);
 }
 
 static bool IsFieldSet(const char* field, size_t len, bool isBinary = false) {
@@ -289,7 +289,7 @@ static inline void CopyPixel(u8* dst, const u8* src, int n) {
             *(u32*)dst = *(u32*)src;
             break;
         default:
-            CrashIf(true);
+            ReportIf(true);
     }
 }
 
diff --git a/src/utils/ThreadUtil.cpp b/src/utils/ThreadUtil.cpp
index 40f6ed09c17..374f9b48af2 100644
--- a/src/utils/ThreadUtil.cpp
+++ b/src/utils/ThreadUtil.cpp
@@ -85,7 +85,7 @@ DWORD WINAPI ThreadBase::ThreadProc(void* data) {
 }
 
 void ThreadBase::Start() {
-    CrashIf(hThread);
+    ReportIf(hThread);
     hThread = CreateThread(nullptr, 0, ThreadProc, this, 0, nullptr);
 }
 
diff --git a/src/utils/TrivialHtmlParser.cpp b/src/utils/TrivialHtmlParser.cpp
index 76c7cbbd0bb..3999817473d 100644
--- a/src/utils/TrivialHtmlParser.cpp
+++ b/src/utils/TrivialHtmlParser.cpp
@@ -18,7 +18,7 @@ memory inside HtmlParser::s, so they don't need to be freed.
 
 bool HtmlElement::NameIs(const char* nameIn) const {
     if (!name) {
-        CrashIf(Tag_NotFound == tag);
+        ReportIf(Tag_NotFound == tag);
         HtmlTag tg = FindHtmlTag(nameIn, str::Len(nameIn));
         return tg == tag;
     }
@@ -29,7 +29,7 @@ bool HtmlElement::NameIs(const char* nameIn) const {
 // (i.e. succeeds for "opf:content" with name="content" and any value of ns)
 // TODO: add proper namespace support
 bool HtmlElement::NameIsNS(const char* nameIn, const char*) const {
-    // CrashIf(!ns);
+    // ReportIf(!ns);
     const char* nameStart = nullptr;
     if (name) {
         nameStart = str::FindChar(name, ':');
@@ -279,7 +279,7 @@ HtmlElement* HtmlParser::ParseInPlace(const ByteSlice& d, uint codepage) {
         }
         if (!tok->IsTag()) {
             // ignore text content
-            CrashIf(!tok->IsText());
+            ReportIf(!tok->IsText());
             continue;
         }
         if (!tok->IsEndTag()) {
diff --git a/src/utils/UITask.cpp b/src/utils/UITask.cpp
index 50c59da8f7c..c065ca99dd6 100644
--- a/src/utils/UITask.cpp
+++ b/src/utils/UITask.cpp
@@ -57,13 +57,13 @@ void Initialize() {
     FillWndClassEx(wcex, UITASK_CLASS_NAME, WndProcTaskDispatch);
     RegisterClassEx(&wcex);
 
-    CrashIf(gTaskDispatchHwnd);
+    ReportIf(gTaskDispatchHwnd);
     gTaskDispatchHwnd = CreateWindow(UITASK_CLASS_NAME, L"UITask Dispatch Window", WS_OVERLAPPED, 0, 0, 0, 0,
                                      HWND_MESSAGE, nullptr, GetModuleHandle(nullptr), nullptr);
 }
 
 void DrainQueue() {
-    CrashIf(!gTaskDispatchHwnd);
+    ReportIf(!gTaskDispatchHwnd);
     MSG msg;
     UINT wmExecTask = GetExecuteTaskMessage();
     while (PeekMessage(&msg, gTaskDispatchHwnd, wmExecTask, wmExecTask, PM_REMOVE)) {
diff --git a/src/utils/Vec.h b/src/utils/Vec.h
index f28b1827468..c91e6e2d92c 100644
--- a/src/utils/Vec.h
+++ b/src/utils/Vec.h
@@ -169,41 +169,41 @@ class Vec {
     }
 
     T& operator[](size_t idx) const {
-        CrashIf(idx >= len);
+        ReportIf(idx >= len);
         return els[idx];
     }
 
     T& operator[](long idx) const {
-        CrashIf(idx < 0);
-        CrashIf((size_t)idx >= len);
+        ReportIf(idx < 0);
+        ReportIf((size_t)idx >= len);
         return els[idx];
     }
 
     T& operator[](ULONG idx) const {
-        CrashIf((size_t)idx >= len);
+        ReportIf((size_t)idx >= len);
         return els[idx];
     }
 
     T& operator[](int idx) const {
-        CrashIf(idx < 0);
-        CrashIf((size_t)idx >= len);
+        ReportIf(idx < 0);
+        ReportIf((size_t)idx >= len);
         return els[idx];
     }
 
     T& at(size_t idx) const {
-        CrashIf(idx >= len);
+        ReportIf(idx >= len);
         return els[idx];
     }
 
     T& at(int idx) const {
-        CrashIf(idx < 0);
-        CrashIf(idx >= (int)len);
+        ReportIf(idx < 0);
+        ReportIf(idx >= (int)len);
         return els[idx];
     }
 
     T& At(int idx) const {
-        CrashIf(idx < 0);
-        CrashIf(idx >= (int)len);
+        ReportIf(idx < 0);
+        ReportIf(idx >= (int)len);
         return els[idx];
     }
 
@@ -278,7 +278,7 @@ class Vec {
     // can be copied via memcpy()
     // TODO: could be extend to take number of elements to remove
     void RemoveAtFast(size_t idx) {
-        CrashIf(idx >= len);
+        ReportIf(idx >= len);
         if (idx >= len) {
             return;
         }
@@ -292,21 +292,21 @@ class Vec {
     }
 
     T Pop() {
-        CrashIf(0 == len);
+        ReportIf(0 == len);
         T el = at(len - 1);
         RemoveAtFast(len - 1);
         return el;
     }
 
     T PopAt(size_t idx) {
-        CrashIf(idx >= len);
+        ReportIf(idx >= len);
         T el = at(idx);
         RemoveAt(idx);
         return el;
     }
 
     T& Last() const {
-        CrashIf(0 == len);
+        ReportIf(0 == len);
         return at(len - 1);
     }
 
diff --git a/src/utils/WinUtil.cpp b/src/utils/WinUtil.cpp
index 1e22609f2ef..3206313a6ad 100755
--- a/src/utils/WinUtil.cpp
+++ b/src/utils/WinUtil.cpp
@@ -67,8 +67,8 @@ void EditSelectAll(HWND hwnd) {
 }
 
 int EditIdealDy(HWND hwnd, bool hasBorder, int lines) {
-    CrashIf(lines < 1);
-    CrashIf(lines > 256);
+    ReportIf(lines < 1);
+    ReportIf(lines > 256);
 
     HFONT hfont = HwndGetFont(hwnd);
     Size s1 = HwndMeasureText(hwnd, "Minimal", hfont);
@@ -170,7 +170,7 @@ Rect MapRectToWindow(Rect rect, HWND hwndFrom, HWND hwndTo) {
 }
 
 int MapWindowPoints(HWND hwndFrom, HWND hwndTo, Point* points, int nPoints) {
-    CrashIf(nPoints > 64);
+    ReportIf(nPoints > 64);
     POINT pnts[64];
     for (int i = 0; i < nPoints; i++) {
         pnts[i].x = points[i].x;
@@ -287,7 +287,7 @@ TempStr GetEnvVariableTemp(const char* name) {
         cchBufSize = res + 4; // +4 jic
         buf = AllocArrayTemp<WCHAR>(cchBufSize);
         res = GetEnvironmentVariableW(nameW, buf, cchBufSize);
-        CrashIf(res == 0 || res > cchBufSize);
+        ReportIf(res == 0 || res > cchBufSize);
     }
     return ToUtf8Temp(buf);
 }
@@ -616,7 +616,7 @@ TempStr GetTempDirTemp() {
         return {};
     }
     // TODO: should handle this
-    CrashIf(cch >= dimof(dir));
+    ReportIf(cch >= dimof(dir));
     return ToUtf8Temp(dir, cch);
 }
 
@@ -1252,7 +1252,7 @@ bool IsCursorOverWindow(HWND hwnd) {
 TempStr HwndGetClassName(HWND hwnd) {
     WCHAR buf[512] = {0};
     int n = GetClassNameW(hwnd, buf, dimof(buf));
-    CrashIf(n == 0);
+    ReportIf(n == 0);
     return ToUtf8Temp(buf);
 }
 
@@ -1308,7 +1308,7 @@ char* GetDefaultPrinterNameTemp() {
 }
 
 static bool CopyOrAppendTextToClipboard(const WCHAR* text, bool appendOnly) {
-    CrashIf(!text);
+    ReportIf(!text);
     if (!text) {
         return false;
     }
@@ -1649,7 +1649,7 @@ HDC DoubleBuffer::GetDC() const {
 }
 
 void DoubleBuffer::Flush(HDC hdc) const {
-    CrashIf(hdc == hdcBuffer);
+    ReportIf(hdc == hdcBuffer);
     if (hdcBuffer) {
         BitBlt(hdc, rect.x, rect.y, rect.dx, rect.dy, hdcBuffer, 0, 0, SRCCOPY);
     }
@@ -1691,18 +1691,18 @@ void DeferWinPosHelper::MoveWindow(HWND hWnd, Rect r) {
 }
 
 void MenuSetChecked(HMENU m, int id, bool isChecked) {
-    CrashIf(id < 0);
+    ReportIf(id < 0);
     CheckMenuItem(m, (UINT)id, MF_BYCOMMAND | (isChecked ? MF_CHECKED : MF_UNCHECKED));
 }
 
 bool MenuSetEnabled(HMENU m, int id, bool isEnabled) {
-    CrashIf(id < 0);
+    ReportIf(id < 0);
     BOOL ret = EnableMenuItem(m, (UINT)id, MF_BYCOMMAND | (isEnabled ? MF_ENABLED : MF_GRAYED));
     return ret != -1;
 }
 
 void MenuRemove(HMENU m, int id) {
-    CrashIf(id < 0);
+    ReportIf(id < 0);
     RemoveMenu(m, (UINT)id, MF_BYCOMMAND);
 }
 
@@ -1713,7 +1713,7 @@ void MenuEmpty(HMENU m) {
 }
 
 void MenuSetText(HMENU m, int id, const WCHAR* s) {
-    CrashIf(id < 0);
+    ReportIf(id < 0);
     MENUITEMINFOW mii{};
     mii.cbSize = sizeof(mii);
     mii.fMask = MIIM_STRING;
@@ -2021,8 +2021,8 @@ static bool IsPalettedBitmap(DIBSECTION& info, int nBytes) {
 }
 
 COLORREF GetPixel(BitmapPixels* bitmap, int x, int y) {
-    CrashIf(x < 0 || x >= bitmap->size.dx);
-    CrashIf(y < 0 || y >= bitmap->size.dy);
+    ReportIf(x < 0 || x >= bitmap->size.dx);
+    ReportIf(y < 0 || y >= bitmap->size.dy);
     u8* pixels = bitmap->pixels;
     u8* pixel = pixels + y * bitmap->nBytesPerRow + x * bitmap->nBytesPerPixel;
     // color order in DIB is blue-green-red-alpha
@@ -2032,7 +2032,7 @@ COLORREF GetPixel(BitmapPixels* bitmap, int x, int y) {
     } else if (4 == bitmap->nBytesPerPixel) {
         c = RGB(pixel[3], pixel[2], pixel[1]);
     } else {
-        CrashIf(true);
+        ReportIf(true);
     }
     return c;
 }
@@ -2042,7 +2042,7 @@ BitmapPixels* GetBitmapPixels(HBITMAP hbmp) {
 
     DIBSECTION info{};
     int nBytes = GetObject(hbmp, sizeof(info), &info);
-    CrashIf(nBytes < sizeof(info.dsBm));
+    ReportIf(nBytes < sizeof(info.dsBm));
     Size size(info.dsBm.bmWidth, info.dsBm.bmHeight);
 
     res->size = size;
@@ -2085,7 +2085,7 @@ BitmapPixels* GetBitmapPixels(HBITMAP hbmp) {
     HDC hdc = CreateCompatibleDC(nullptr);
     int bmpBytes = size.dx * size.dy * 4;
     ScopedMem<u8> bmpData((u8*)malloc(bmpBytes));
-    CrashIf(!bmpData);
+    ReportIf(!bmpData);
 
     if (!GetDIBits(hdc, hbmp, 0, size.dy, bmpData, &bmi, DIB_RGB_COLORS)) {
         DeleteDC(hdc);
@@ -2111,7 +2111,7 @@ void UpdateBitmapColors(HBITMAP hbmp, COLORREF textColor, COLORREF bgColor) {
 
     DIBSECTION info{};
     int ret = GetObject(hbmp, sizeof(info), &info);
-    CrashIf(ret < sizeof(info.dsBm));
+    ReportIf(ret < sizeof(info.dsBm));
     Size size(info.dsBm.bmWidth, info.dsBm.bmHeight);
 
     // for mapped 32-bit DI bitmaps: directly access the pixel data
@@ -2142,7 +2142,7 @@ void UpdateBitmapColors(HBITMAP hbmp, COLORREF textColor, COLORREF bgColor) {
 
     // for paletted DI bitmaps: only update the color palette
     if (sizeof(info) == ret && info.dsBmih.biBitCount && info.dsBmih.biBitCount <= 8) {
-        CrashIf(info.dsBmih.biBitCount != 8);
+        ReportIf(info.dsBmih.biBitCount != 8);
         RGBQUAD palette[256];
         HDC hDC = CreateCompatibleDC(nullptr);
         DeleteObject(SelectObject(hDC, hbmp));
@@ -2170,7 +2170,7 @@ void UpdateBitmapColors(HBITMAP hbmp, COLORREF textColor, COLORREF bgColor) {
     HDC hDC = CreateCompatibleDC(nullptr);
     int bmpBytes = size.dx * size.dy * 4;
     ScopedMem<u8> bmpData((u8*)malloc(bmpBytes));
-    CrashIf(!bmpData);
+    ReportIf(!bmpData);
 
     if (GetDIBits(hDC, hbmp, 0, size.dy, bmpData, &bmi, DIB_RGB_COLORS)) {
         for (int i = 0; i < bmpBytes; i++) {
@@ -2397,18 +2397,18 @@ void VariantInitBstr(VARIANT& urlVar, const WCHAR* s) {
 
 ByteSlice LoadDataResource(int resId) {
     HRSRC resSrc = FindResourceW(nullptr, MAKEINTRESOURCE(resId), RT_RCDATA);
-    CrashIf(!resSrc);
+    ReportIf(!resSrc);
     if (!resSrc) {
         return {};
     }
     HGLOBAL res = LoadResource(nullptr, resSrc);
-    CrashIf(!res);
+    ReportIf(!res);
     if (!res) {
         return {};
     }
     DWORD size = SizeofResource(nullptr, resSrc);
     const char* resData = (const char*)LockResource(res);
-    CrashIf(!resData);
+    ReportIf(!resData);
     if (!resData) {
         return {};
     }
@@ -2430,7 +2430,7 @@ bool DDEExecute(const WCHAR* server, const WCHAR* topic, const WCHAR* command) {
     DWORD cbLen = 0;
     HDDEDATA answer;
 
-    CrashIf(str::Len(command) >= INT_MAX - 1);
+    ReportIf(str::Len(command) >= INT_MAX - 1);
     if (str::Len(command) >= INT_MAX - 1) {
         return false;
     }
@@ -2543,13 +2543,13 @@ static void LogCursor(LPWSTR) {
 
 HCURSOR GetCachedCursor(LPWSTR cursorId) {
     int i = GetCursorIndex(cursorId);
-    CrashIf(i < 0);
+    ReportIf(i < 0);
     if (i < 0) {
         return nullptr;
     }
     if (nullptr == cachedCursors[i]) {
         cachedCursors[i] = LoadCursor(nullptr, cursorId);
-        CrashIf(cachedCursors[i] == nullptr);
+        ReportIf(cachedCursors[i] == nullptr);
     }
     return cachedCursors[i];
 }
@@ -2735,11 +2735,11 @@ void HwndResizeClientSize(HWND hwnd, int dx, int dy) {
     DWORD exStyle = GetWindowExStyle(hwnd);
     RECT r = {x, y, x + dx, y + dy};
     BOOL ok = AdjustWindowRectEx(&r, style, false, exStyle);
-    CrashIf(!ok);
+    ReportIf(!ok);
     int dx2 = RectDx(r);
     int dy2 = RectDy(r);
     ok = SetWindowPos(hwnd, nullptr, 0, 0, dx2, dy2, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREPOSITION);
-    CrashIf(!ok);
+    ReportIf(!ok);
 }
 
 // position hwnd on the right of hwndRelative
@@ -2784,7 +2784,7 @@ void HwndDestroyWindowSafe(HWND* hwndPtr) {
 
 void TbSetButtonInfo(HWND hwnd, int buttonId, TBBUTTONINFO* info) {
     auto res = SendMessageW(hwnd, TB_SETBUTTONINFO, buttonId, (LPARAM)info);
-    CrashIf(0 == res);
+    ReportIf(0 == res);
 }
 
 void TbGetPadding(HWND hwnd, int* padX, int* padY) {
@@ -2796,13 +2796,13 @@ void TbGetPadding(HWND hwnd, int* padX, int* padY) {
 void TbSetPadding(HWND hwnd, int padX, int padY) {
     LPARAM lp = MAKELPARAM(padX, padY);
     auto res = SendMessageW(hwnd, TB_SETPADDING, 0, lp);
-    CrashIf(0 == res);
+    ReportIf(0 == res);
 }
 
 // https://docs.microsoft.com/en-us/windows/win32/controls/tb-getrect
 void TbGetRect(HWND hwnd, int buttonId, RECT* rc) {
     auto res = SendMessageW(hwnd, TB_GETRECT, buttonId, (LPARAM)rc);
-    CrashIf(res == 0);
+    ReportIf(res == 0);
 }
 
 void TbGetMetrics(HWND hwnd, TBMETRICS* metrics) {
diff --git a/src/utils/ZipUtil.cpp b/src/utils/ZipUtil.cpp
index 7d953237124..0460c8480fe 100644
--- a/src/utils/ZipUtil.cpp
+++ b/src/utils/ZipUtil.cpp
@@ -102,8 +102,8 @@ static u32 zip_compress(void* dst, u32 dstlen, const void* src, u32 srclen) {
 }
 
 bool ZipCreator::AddFileData(const char* nameUtf8, const void* data, size_t size, u32 dosdate) {
-    CrashIf(size >= UINT32_MAX);
-    CrashIf(str::Len(nameUtf8) >= UINT16_MAX);
+    ReportIf(size >= UINT32_MAX);
+    ReportIf(str::Len(nameUtf8) >= UINT16_MAX);
     if (size >= UINT32_MAX) {
         return false;
     }
@@ -141,7 +141,7 @@ bool ZipCreator::AddFileData(const char* nameUtf8, const void* data, size_t size
     local.Write32((u32)size);
     local.Write16((u16)namelen);
     local.Write16(0); // extra field length
-    CrashIf(local.d.size() != kHdrSize);
+    ReportIf(local.d.size() != kHdrSize);
 
     char* localHeader = local.d.Get();
     bool ok = WriteData(localHeader, kHdrSize);
@@ -166,7 +166,7 @@ bool ZipCreator::AddFileData(const char* nameUtf8, const void* data, size_t size
     central.Write16(0); // internal file attributes
     central.Write32(0); // external file attributes
     central.Write32((u32)fileOffset);
-    CrashIf(central.d.size() != kCentralSize);
+    ReportIf(central.d.size() != kCentralSize);
 
     centraldir.Append(central.d.Get(), kCentralSize);
     centraldir.Append(nameUtf8, namelen);
@@ -227,8 +227,8 @@ bool ZipCreator::AddDir(const char* dir, bool recursive) {
 }
 
 bool ZipCreator::Finish() {
-    CrashIf(bytesWritten >= UINT32_MAX);
-    CrashIf(fileCount >= UINT16_MAX);
+    ReportIf(bytesWritten >= UINT32_MAX);
+    ReportIf(fileCount >= UINT16_MAX);
     if (bytesWritten >= UINT32_MAX || fileCount >= UINT16_MAX) {
         return false;
     }
@@ -243,7 +243,7 @@ bool ZipCreator::Finish() {
     eocd.Write32((u32)centraldir.size());
     eocd.Write32((u32)bytesWritten);
     eocd.Write16(0); // comment len
-    CrashIf(eocd.d.size() != kDirSize);
+    ReportIf(eocd.d.size() != kDirSize);
 
     bool ok = WriteData(centraldir.Get(), centraldir.size());
     ok = ok && WriteData(eocd.d.Get(), kDirSize);
diff --git a/src/utils/tests/Dict_ut.cpp b/src/utils/tests/Dict_ut.cpp
index 4dfe2f7d4a9..ab77277e302 100644
--- a/src/utils/tests/Dict_ut.cpp
+++ b/src/utils/tests/Dict_ut.cpp
@@ -67,8 +67,8 @@ void DictTestMapStrToInt() {
         toRemove.Append(str::Dup(k));
         utassert(toRemove.size() == d.Count());
         ok = d.Get(k, &val);
-        CrashIf(!ok);
-        CrashIf(i != val);
+        ReportIf(!ok);
+        ReportIf(i != val);
     }
     for (const char* k : toRemove) {
         ok = d.Remove(k, nullptr);
diff --git a/src/utils/windrawlib.cpp b/src/utils/windrawlib.cpp
index 9ac320e9778..3e86da1ea8b 100644
--- a/src/utils/windrawlib.cpp
+++ b/src/utils/windrawlib.cpp
@@ -286,7 +286,7 @@ static int wd_init_string_api(void) {
 
 static void dwrite_fini(void) {
     auto refCnt = dwrite_factory->Release();
-    CrashIf(refCnt != 0);
+    ReportIf(refCnt != 0);
     dwrite_factory = nullptr;
 }
 
diff --git a/src/wingui/FrameRateWnd.cpp b/src/wingui/FrameRateWnd.cpp
index 45f47901224..f3669e98b4b 100755
--- a/src/wingui/FrameRateWnd.cpp
+++ b/src/wingui/FrameRateWnd.cpp
@@ -131,7 +131,7 @@ static void RegisterFrameRateWndClass() {
     WNDCLASSEX wcex{};
     FillWndClassEx(wcex, FRAME_RATE_CLASS_NAME, WndProcFrameRate);
     atom = RegisterClassEx(&wcex);
-    CrashIf(!atom);
+    ReportIf(!atom);
 }
 
 bool FrameRateWnd::Create(HWND hwndAssociatedWith) {
@@ -155,7 +155,7 @@ bool FrameRateWnd::Create(HWND hwndAssociatedWith) {
     // WS_EX_TRANSPARENT so that the mouse events fall through to the window below
     HWND hwnd2 = CreateWindowEx(WS_EX_LAYERED | WS_EX_TRANSPARENT, FRAME_RATE_CLASS_NAME, nullptr, dwStyle, 0, 0, 0, 0,
                                 this->hwndAssociatedWith, nullptr, GetModuleHandle(nullptr), this);
-    CrashIf(hwnd2 != this->hwnd);
+    ReportIf(hwnd2 != this->hwnd);
     if (!hwnd) {
         return false;
     }
diff --git a/src/wingui/Layout.cpp b/src/wingui/Layout.cpp
index 51e44647a09..decc560efb2 100644
--- a/src/wingui/Layout.cpp
+++ b/src/wingui/Layout.cpp
@@ -1074,7 +1074,7 @@ Insets DefaultInsets() {
 }
 
 Insets DpiScaledInsets(HWND hwnd, int top, int right, int bottom, int left) {
-    CrashIf(top < 0);
+    ReportIf(top < 0);
     if (right == -1) {
         // only first given, consider all to be the same
         right = top;
@@ -1086,7 +1086,7 @@ Insets DpiScaledInsets(HWND hwnd, int top, int right, int bottom, int left) {
         bottom = top;
         left = right;
     }
-    CrashIf(left == -1);
+    ReportIf(left == -1);
     Insets res = {DpiScale(hwnd, top), DpiScale(hwnd, right), DpiScale(hwnd, bottom), DpiScale(hwnd, left)};
     return res;
 }
@@ -1194,18 +1194,18 @@ void TableLayout::SetBounds(Rect) {
 }
 
 void TableLayout::SetSize(int rows, int cols) {
-    CrashIf(cells);     // TODO: maybe allow re-sizing
-    CrashIf(rows <= 0); // TODO: maybe allow empty
-    CrashIf(cols <= 0); // TODO: maybe allow empty
+    ReportIf(cells);     // TODO: maybe allow re-sizing
+    ReportIf(rows <= 0); // TODO: maybe allow empty
+    ReportIf(cols <= 0); // TODO: maybe allow empty
     int n = rows * cols;
     cells = AllocArray<Cell>(n);
     maxColWidths = AllocArray<int>(cols);
 }
 
 int TableLayout::CellIdx(int row, int col) {
-    CrashIf(!cells);
-    CrashIf(row < 0 || row >= rows);
-    CrashIf(col < 0 || col >= cols);
+    ReportIf(!cells);
+    ReportIf(row < 0 || row >= rows);
+    ReportIf(col < 0 || col >= cols);
     int idx = col * cols + row;
     return idx;
 }
diff --git a/src/wingui/WinGui.cpp b/src/wingui/WinGui.cpp
index b10b349d2ca..43a898a79c8 100644
--- a/src/wingui/WinGui.cpp
+++ b/src/wingui/WinGui.cpp
@@ -234,7 +234,7 @@ static LRESULT CALLBACK StaticWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPA
 
     if (msg == WM_NCCREATE) {
         CREATESTRUCT* cs = (CREATESTRUCT*)(lparam);
-        CrashIf(window);
+        ReportIf(window);
         window = (Wnd*)(cs->lpCreateParams);
         window->hwnd = hwnd;
         WindowMapAdd(hwnd, window);
@@ -281,7 +281,7 @@ TempStr Wnd::GetTextTemp() {
 }
 
 void Wnd::SetVisibility(Visibility newVisibility) {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     visibility = newVisibility;
     bool isVisible = IsVisible();
     // TODO: a different way to determine if is top level vs. child window?
@@ -553,7 +553,7 @@ int Wnd::MinIntrinsicWidth(int) {
 }
 
 void Wnd::Close() {
-    CrashIf(!::IsWindow(hwnd));
+    ReportIf(!::IsWindow(hwnd));
     PostMessageW(hwnd, WM_CLOSE, 0, 0);
 }
 
@@ -902,8 +902,8 @@ bool Wnd::PreTranslateMessage(MSG& msg) {
 }
 
 void Wnd::Attach(HWND hwnd) {
-    CrashIf(!IsWindow(hwnd));
-    CrashIf(WindowMapGetWindow(hwnd));
+    ReportIf(!IsWindow(hwnd));
+    ReportIf(WindowMapGetWindow(hwnd));
 
     this->hwnd = hwnd;
     Subclass();
@@ -912,7 +912,7 @@ void Wnd::Attach(HWND hwnd) {
 
 // Attaches a CWnd object to a dialog item.
 void Wnd::AttachDlgItem(UINT id, HWND parent) {
-    CrashIf(!::IsWindow(parent));
+    ReportIf(!::IsWindow(parent));
     HWND wnd = ::GetDlgItem(parent, id);
     Attach(wnd);
 }
@@ -949,11 +949,11 @@ static void WndRegisterClass(const WCHAR* className) {
     wc.hCursor = ::LoadCursor(nullptr, IDC_ARROW);
     wc.hbrBackground = reinterpret_cast<HBRUSH>(::GetStockObject(WHITE_BRUSH));
     ATOM atom = ::RegisterClassExW(&wc);
-    CrashIf(!atom);
+    ReportIf(!atom);
 }
 
 HWND Wnd::CreateControl(const CreateControlArgs& args) {
-    CrashIf(!args.className);
+    ReportIf(!args.className);
     // TODO: validate that className is one of the known controls?
 
     font = args.font;
@@ -983,7 +983,7 @@ HWND Wnd::CreateControl(const CreateControlArgs& args) {
     void* createParams = this;
     hwnd = ::CreateWindowExW(exStyle, className, L"", style, x, y, dx, dy, parent, id, inst, createParams);
     HwndSetFont(hwnd, font);
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
 
     // TODO: validate that
     Subclass();
@@ -1037,7 +1037,7 @@ HWND Wnd::CreateCustom(const CreateCustomArgs& args) {
 
     DWORD tmpStyle = style & ~WS_VISIBLE;
     DWORD exStyle = args.exStyle;
-    CrashIf(args.menu && args.cmdId);
+    ReportIf(args.menu && args.cmdId);
     HMENU m = args.menu;
     if (m == nullptr) {
         m = (HMENU)(INT_PTR)args.cmdId;
@@ -1048,10 +1048,10 @@ HWND Wnd::CreateCustom(const CreateCustomArgs& args) {
 
     HWND hwndTmp = ::CreateWindowExW(exStyle, className, titleW, style, x, y, dx, dy, parent, m, inst, createParams);
 
-    CrashIf(!hwndTmp);
+    ReportIf(!hwndTmp);
     // hwnd should be assigned in WM_CREATE
-    CrashIf(hwndTmp != hwnd);
-    CrashIf(this != WindowMapGetWindow(hwndTmp));
+    ReportIf(hwndTmp != hwnd);
+    ReportIf(this != WindowMapGetWindow(hwndTmp));
     if (!hwnd) {
         return nullptr;
     }
@@ -1079,8 +1079,8 @@ void Wnd::SetInsetsPt(int top, int right, int bottom, int left) {
 }
 
 void Wnd::Subclass() {
-    CrashIf(!IsWindow(hwnd));
-    CrashIf(subclassId); // don't subclass multiple times
+    ReportIf(!IsWindow(hwnd));
+    ReportIf(subclassId); // don't subclass multiple times
     if (subclassId) {
         return;
     }
@@ -1088,7 +1088,7 @@ void Wnd::Subclass() {
 
     subclassId = NextSubclassId();
     BOOL ok = SetWindowSubclass(hwnd, StaticWindowProcSubclassed, subclassId, (DWORD_PTR)this);
-    CrashIf(!ok);
+    ReportIf(!ok);
 }
 
 void Wnd::UnSubclass() {
@@ -1109,7 +1109,7 @@ void Wnd::SetFont(HFONT fontIn) {
 }
 
 void Wnd::SetIsEnabled(bool isEnabled) const {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     BOOL enabled = isEnabled ? TRUE : FALSE;
     ::EnableWindow(hwnd, enabled);
 }
@@ -1129,7 +1129,7 @@ bool Wnd::IsFocused() const {
 }
 
 void Wnd::SetRtl(bool isRtl) const {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     SetWindowExStyle(hwnd, WS_EX_LAYOUTRTL | WS_EX_NOINHERITLAYOUT, isRtl);
 }
 
@@ -1212,7 +1212,7 @@ HWND Static::Create(const StaticCreateArgs& args) {
 }
 
 Size Static::GetIdealSize() {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     char* txt = HwndGetTextTemp(hwnd);
     HFONT hfont = GetWindowFont(hwnd);
     return HwndMeasureText(hwnd, txt, hfont);
@@ -1231,7 +1231,7 @@ bool Static::OnCommand(WPARAM wparam, LPARAM lparam) {
 void Handle_WM_CTLCOLORSTATIC(void* user, WndEvent* ev) {
     auto w = (StaticCtrl*)user;
     uint msg = ev->msg;
-    CrashIf(msg != WM_CTLCOLORSTATIC);
+    ReportIf(msg != WM_CTLCOLORSTATIC);
     HDC hdc = (HDC)ev->wp;
     if (w->textColor != ColorUnset) {
         SetTextColor(hdc, w->textColor);
@@ -1567,11 +1567,11 @@ void Tooltip::Delete(int id) {
     if (id == 0) {
         // 0 means delete a single tool
         // should only be used if we only have single tool
-        CrashIf(Count() > 1);
+        ReportIf(Count() > 1);
         id = tooltipIds[0];
     } else {
         removeIdx = tooltipIds.Find(id);
-        CrashIf(removeIdx < 0);
+        ReportIf(removeIdx < 0);
     }
 
     TOOLINFOW ti{0};
@@ -1581,7 +1581,7 @@ void Tooltip::Delete(int id) {
     int n1 = (int)SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0);
     SendMessageW(hwnd, TTM_DELTOOLW, 0, (LPARAM)&ti);
     int n2 = (int)SendMessageW(hwnd, TTM_GETTOOLCOUNT, 0, 0);
-    CrashIf(n1 != n2 + 1);
+    ReportIf(n1 != n2 + 1);
     tooltipIds.RemoveAt(removeIdx);
 }
 
@@ -1589,9 +1589,9 @@ void Tooltip::Delete(int id) {
 // type is: TTDT_AUTOPOP, TTDT_INITIAL, TTDT_RESHOW, TTDT_AUTOMATIC
 // timeInMs is max 32767 (~32 secs)
 void Tooltip::SetDelayTime(int type, int timeInMs) {
-    CrashIf(!IsValidDelayType(type));
-    CrashIf(timeInMs < 0);
-    CrashIf(timeInMs > 32767); // TODO: or is it 65535?
+    ReportIf(!IsValidDelayType(type));
+    ReportIf(timeInMs < 0);
+    ReportIf(timeInMs > 32767); // TODO: or is it 65535?
     SendMessageW(hwnd, TTM_SETDELAYTIME, type, (LPARAM)timeInMs);
 }
 
@@ -1749,9 +1749,9 @@ bool Edit::OnCommand(WPARAM wparam, LPARAM lparam) {
 // https://docs.microsoft.com/en-us/windows/win32/controls/wm-ctlcoloredit
 static void Handle_WM_CTLCOLOREDIT(void* user, WndEvent* ev) {
     auto w = (EditCtrl*)user;
-    CrashIf(ev->msg != WM_CTLCOLOREDIT);
+    ReportIf(ev->msg != WM_CTLCOLOREDIT);
     HWND hwndCtrl = (HWND)ev->lp;
-    CrashIf(hwndCtrl != w->hwnd);
+    ReportIf(hwndCtrl != w->hwnd);
     if (w->bgBrush == nullptr) {
         return;
     }
@@ -1913,7 +1913,7 @@ static CheckState GetButtonCheckState(HWND hwnd) {
 }
 
 static void SetButtonCheckState(HWND hwnd, CheckState newState) {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     Button_SetCheck(hwnd, newState);
 }
 
@@ -1948,7 +1948,7 @@ Size Checkbox::GetIdealSize() {
 }
 
 void Checkbox::SetCheckState(CheckState newState) {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     SetButtonCheckState(hwnd, newState);
 }
 
@@ -1957,13 +1957,13 @@ CheckState Checkbox::GetCheckState() const {
 }
 
 void Checkbox::SetIsChecked(bool isChecked) {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     CheckState newState = isChecked ? CheckState::Checked : CheckState::Unchecked;
     SetButtonCheckState(hwnd, newState);
 }
 
 bool Checkbox::IsChecked() const {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     auto state = GetCheckState();
     return state == CheckState::Checked;
 }
@@ -2077,7 +2077,7 @@ void DropDown::SetCurrentSelection(int n) {
         return;
     }
     int nItems = items.Size();
-    CrashIf(n >= nItems);
+    ReportIf(n >= nItems);
     ComboBox_SetCurSel(hwnd, n);
 }
 
@@ -2318,7 +2318,7 @@ Splitter::~Splitter() {
 }
 
 HWND Splitter::Create(const SplitterCreateArgs& args) {
-    CrashIf(!args.parent);
+    ReportIf(!args.parent);
 
     isLive = args.isLive;
     type = args.type;
@@ -2328,9 +2328,9 @@ HWND Splitter::Create(const SplitterCreateArgs& args) {
     }
 
     bmp = CreateBitmap(8, 8, 1, 1, dotPatternBmp);
-    CrashIf(!bmp);
+    ReportIf(!bmp);
     brush = CreatePatternBrush(bmp);
-    CrashIf(!brush);
+    ReportIf(!brush);
 
     DWORD style = GetWindowLong(args.parent, GWL_STYLE);
     parentClipsChildren = bit::IsMaskSet<DWORD>(style, WS_CLIPCHILDREN);
@@ -2655,7 +2655,7 @@ void Webview2Wnd::OnBrowserMessage(const char* msg) {
 }
 
 HWND Webview2Wnd::Create(const CreateCustomArgs& args) {
-    CrashIf(!dataDir);
+    ReportIf(!dataDir);
     CreateCustom(args);
     if (!hwnd) {
         return nullptr;
@@ -2749,9 +2749,9 @@ Size TreeView::GetIdealSize() {
 }
 
 void TreeView::SetToolTipsDelayTime(int type, int timeInMs) {
-    CrashIf(!IsValidDelayType(type));
-    CrashIf(timeInMs < 0);
-    CrashIf(timeInMs > 32767); // TODO: or is it 65535?
+    ReportIf(!IsValidDelayType(type));
+    ReportIf(timeInMs < 0);
+    ReportIf(timeInMs > 32767); // TODO: or is it 65535?
     HWND hwndToolTips = GetToolTipsHwnd();
     SendMessageW(hwndToolTips, TTM_SETDELAYTIME, type, (LPARAM)timeInMs);
 }
@@ -3004,7 +3004,7 @@ HTREEITEM insertItemFront(TreeView* treeView, TreeItem ti, HTREEITEM parent) {
 
 bool TreeView::UpdateItem(TreeItem ti) {
     HTREEITEM ht = GetHandleByTreeItem(ti);
-    CrashIf(!ht);
+    ReportIf(!ht);
     if (!ht) {
         return false;
     }
@@ -3033,7 +3033,7 @@ void PopulateTreeItem(TreeView* treeView, TreeItem item, HTREEITEM parent) {
     // insert backwards, so gather the items in v first
     for (int i = 0; i < n; i++) {
         auto ti = tm->ChildAt(item, i);
-        CrashIf(ti == 0);
+        ReportIf(ti == 0);
         a[n - 1 - i] = ti;
     }
 
@@ -3056,7 +3056,7 @@ static void PopulateTree(TreeView* treeView, TreeModel* tm) {
 }
 
 void TreeView::SetTreeModel(TreeModel* tm) {
-    CrashIf(!tm);
+    ReportIf(!tm);
 
     SuspendRedraw();
 
@@ -3072,13 +3072,13 @@ void TreeView::SetTreeModel(TreeModel* tm) {
 
 void TreeView::SetCheckState(TreeItem item, bool enable) {
     HTREEITEM hi = GetHandleByTreeItem(item);
-    CrashIf(!hi);
+    ReportIf(!hi);
     TreeView_SetCheckState(hwnd, hi, enable);
 }
 
 bool TreeView::GetCheckState(TreeItem item) {
     HTREEITEM hi = GetHandleByTreeItem(item);
-    CrashIf(!hi);
+    ReportIf(!hi);
     auto res = TreeView_GetCheckState(hwnd, hi);
     return res != 0;
 }
@@ -3087,7 +3087,7 @@ TreeItemState TreeView::GetItemState(TreeItem ti) {
     TreeItemState res;
 
     TVITEMW* it = GetTVITEM(this, ti);
-    CrashIf(!it);
+    ReportIf(!it);
     if (!it) {
         return res;
     }
@@ -3948,7 +3948,7 @@ int TabsCtrl::TabCount() {
 
 // takes ownership of tab
 int TabsCtrl::InsertTab(int idx, TabInfo* tab) {
-    CrashIf(idx < 0);
+    ReportIf(idx < 0);
     TCITEMW item{0};
     item.mask = TCIF_TEXT;
     item.pszText = ToWStrTemp(tab->text);
@@ -3977,10 +3977,10 @@ void TabsCtrl::SetTextAndTooltip(int idx, const char* text, const char* tooltip)
 
 // returns userData because it's not owned by TabsCtrl
 UINT_PTR TabsCtrl::RemoveTab(int idx) {
-    CrashIf(idx < 0);
-    CrashIf(idx >= TabCount());
+    ReportIf(idx < 0);
+    ReportIf(idx >= TabCount());
     BOOL ok = TabCtrl_DeleteItem(hwnd, idx);
-    CrashIf(!ok);
+    ReportIf(!ok);
     TabInfo* tab = tabs[idx];
     UINT_PTR userData = tab->userData;
     tabs.RemoveAt(idx);
@@ -4017,7 +4017,7 @@ int TabsCtrl::GetSelected() {
 }
 
 int TabsCtrl::SetSelected(int idx) {
-    CrashIf(idx < 0 || idx >= TabCount());
+    ReportIf(idx < 0 || idx >= TabCount());
     int prevSelectedIdx = TabCtrl_SetCurSel(hwnd, idx);
     return prevSelectedIdx;
 }
@@ -4088,12 +4088,12 @@ void RunModalWindow(HWND hwndDialog, HWND hwndParent) {
 #if 0
 // sets initial position of w within hwnd. Assumes w->initialSize is set.
 void PositionCloseTo(Wnd* w, HWND hwnd) {
-    CrashIf(!hwnd);
+    ReportIf(!hwnd);
     Size is = w->initialSize;
-    CrashIf(is.IsEmpty());
+    ReportIf(is.IsEmpty());
     RECT r{};
     BOOL ok = GetWindowRect(hwnd, &r);
-    CrashIf(!ok);
+    ReportIf(!ok);
 
     // position w in the the center of hwnd
     // if window is bigger than hwnd, let the system position