2 files changed, 11 insertions, 4 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 1e05f438..da369c8c 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -1495,6 +1495,9 @@ void render_GmDocument(const iGmDocument *d, iRangei visRangeY, iGmDocumentRende
 }
 
 static iBool isValidRun_GmDocument_(const iGmDocument *d, const iGmRun *run) {
+    if (isEmpty_Array(&d->layout)) {
+        return iFalse;
+    }
     return run >= (const iGmRun *) constAt_Array(&d->layout, 0) &&
            run < (const iGmRun *) constEnd_Array(&d->layout);
 }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ddca557b..9e322f65 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1769,7 +1769,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         if (equal_Rangei(vis, current)) {
             remove_Periodic(periodic_App(), d);
             /* Scrolling has stopped, begin filling up the buffer. */
-            addTicker_App(prerender_DocumentWidget_, d);
+            if (d->visBuf->buffers[0].texture) {
+                addTicker_App(prerender_DocumentWidget_, d);
+            }
         }
         return iTrue;
     }
@@ -3837,9 +3839,11 @@ static void prerender_DocumentWidget_(iAny *context) {
         .showLinkNumbers = (d->flags & showLinkNumbers_DocumentWidgetFlag) != 0
     };
 //    printf("%u prerendering\n", SDL_GetTicks());
-    if (render_DocumentWidget_(d, &ctx, iTrue /* just fill up progressively */)) {
-        /* Something was drawn, should check if there is still more to do. */
-        addTicker_App(prerender_DocumentWidget_, context);
+    if (d->visBuf->buffers[0].texture) {
+        if (render_DocumentWidget_(d, &ctx, iTrue /* just fill up progressively */)) {
+            /* Something was drawn, should check if there is still more to do. */
+            addTicker_App(prerender_DocumentWidget_, context);
+        }
     }
 }