diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c
index 87f8c8596..0ce880051 100644
--- a/xwords4/android/XWords4/jni/xwjni.c
+++ b/xwords4/android/XWords4/jni/xwjni.c
@@ -1261,6 +1261,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1do
 {
     jboolean result;
     XWJNI_START();
+    XP_ASSERT( !!state->game.server );
     result = server_do( state->game.server );
     XWJNI_END();
     return result;
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
index 04fc49e7c..dd087a0cd 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
@@ -766,7 +766,7 @@ public class JNIThread extends Thread {
 
         if ( stop ) {
             waitToStop( true );
-        } else {
+        } else if ( null != m_lastSavedState ) { // has configure() run?
             handle( JNICmd.CMD_SAVE );         // in case releaser has made changes
         }
     }