diff --git a/desktop/gui.cpp b/desktop/gui.cpp
index 46e757f..234be9c 100644
--- a/desktop/gui.cpp
+++ b/desktop/gui.cpp
@@ -4038,6 +4038,11 @@ EsCanvasPane *EsCanvasPaneCreate(EsElement *parent, uint64_t flags, EsStyleID st
 // TODO Inline backgrounds.
 
 void TextDisplayFreeRuns(EsTextDisplay *display) {
+	if (display->plan) {
+		EsTextPlanDestroy(display->plan);
+		display->plan = nullptr;
+	}
+
 	if (display->usingSyntaxHighlighting) {
 		Array<EsTextRun> textRuns = { display->textRuns };
 		textRuns.Free();
@@ -4097,10 +4102,6 @@ int ProcessTextDisplayMessage(EsElement *element, EsMessage *message) {
 			display->measurementCache.Store(message);
 		}
 	} else if (message->type == ES_MSG_DESTROY) {
-		if (display->plan) {
-			EsTextPlanDestroy(display->plan);
-		}
-
 		TextDisplayFreeRuns(display);
 		EsHeapFree(display->contents);
 	} else if (message->type == ES_MSG_GET_INSPECTOR_INFORMATION) {
diff --git a/util/start.script b/util/start.script
index f116f80..0cf83e7 100644
--- a/util/start.script
+++ b/util/start.script
@@ -113,7 +113,7 @@ void GenerateAPISamples() {
 				if section == "[build]" && StringStartsWith(line, "source=") config[i] = "source=" + sourceFile;
 			}
 
-			FileWriteAll(folder + "make.build_core", StringJoin(config, "\n", false));
+			assert FileWriteAll(folder + "make.build_core", StringJoin(config, "\n", false));
 		}
 	}
 }