From a8ee710daaba1ae5501cd906c3a516a607e2e53f Mon Sep 17 00:00:00 2001
From: EricKuck <eric@bluelinelabs.com>
Date: Tue, 9 Sep 2025 09:37:54 -0400
Subject: [PATCH] Fix NPE when navigating away from a screen with RiveUI

---
 kotlin/src/main/kotlin/app/rive/RiveUI.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kotlin/src/main/kotlin/app/rive/RiveUI.kt b/kotlin/src/main/kotlin/app/rive/RiveUI.kt
index 5518f8ee..503cd888 100644
--- a/kotlin/src/main/kotlin/app/rive/RiveUI.kt
+++ b/kotlin/src/main/kotlin/app/rive/RiveUI.kt
@@ -256,14 +256,16 @@ fun RiveUI(
                 }
 
                 commandQueue.advanceStateMachine(stateMachineHandle, deltaTimeNs)
-                commandQueue.draw(
+                surface?.let { surface ->
+                  commandQueue.draw(
                     artboardHandle,
                     stateMachineHandle,
                     fit,
                     alignment,
-                    surface!!,
+                    surface,
                     clearColor
-                )
+                  )
+                }
             }
         }
     }