diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
index 01385b705..25b272a75 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
@@ -117,16 +117,22 @@ public class ChatDelegate extends DelegateBase {
     @Override
     protected void onResume() 
     {
-        s_visibleThis = this;
-        m_jniThreadRef = JNIThread.getRetained( m_rowid );
-        Assert.assertNotNull( m_jniThreadRef );
         super.onResume();
+        m_jniThreadRef = JNIThread.getRetained( m_rowid );
+        if ( null == m_jniThreadRef ) {
+            DbgUtils.logf( "ChatDelegate.onResume(): m_jniThreadRef null; exiting" );
+            finish();
+        } else {
+            s_visibleThis = this;
+        }
     }
 
     @Override
     protected void onPause()
     {
-        m_jniThreadRef.release();
+        if ( null != m_jniThreadRef ) {
+            m_jniThreadRef.release();
+        }
         s_visibleThis = null;
         super.onPause();
     }