1 files changed, 9 insertions, 4 deletions
diff --git a/platform/default/src/mbgl/gfx/headless_frontend.cpp b/platform/default/src/mbgl/gfx/headless_frontend.cpp
index 0e97c40e49..f5e6b7f482 100644
--- a/platform/default/src/mbgl/gfx/headless_frontend.cpp
+++ b/platform/default/src/mbgl/gfx/headless_frontend.cpp
@@ -132,19 +132,24 @@ PremultipliedImage HeadlessFrontend::readStillImage() {
 
 PremultipliedImage HeadlessFrontend::render(Map& map) {
     PremultipliedImage result;
+    std::exception_ptr error;
 
-    map.renderStill([&](std::exception_ptr error) {
-        if (error) {
-            std::rethrow_exception(error);
+    map.renderStill([&](std::exception_ptr e) {
+        if (e) {
+            error = e;
         } else {
             result = backend->readStillImage();
         }
     });
 
-    while (!result.valid()) {
+    while (!result.valid() && !error) {
         util::RunLoop::Get()->runOnce();
     }
 
+    if (error) {
+        std::rethrow_exception(error);
+    }
+      
     return result;
 }