diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
index c55a196a6..f2683a635 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
@@ -577,7 +577,9 @@ public class GameConfig extends XWActivity
 
     public void onClick( View view ) 
     {
-        if ( m_addPlayerButton == view ) {
+        if ( null == m_gameLock ) {
+            // do nothing; we're on the way out
+        } else if ( m_addPlayerButton == view ) {
             int curIndex = m_gi.nPlayers;
             if ( curIndex < CurGameInfo.MAX_NUM_PLAYERS ) {
                 m_gi.addPlayer(); // ups nPlayers
@@ -621,7 +623,9 @@ public class GameConfig extends XWActivity
     public boolean onKeyDown( int keyCode, KeyEvent event )
     {
         boolean consumed = false;
-        if ( keyCode == KeyEvent.KEYCODE_BACK ) {
+        if ( null == m_gameLock ) {
+            // Do nothing; we're on our way out
+        } else if ( keyCode == KeyEvent.KEYCODE_BACK ) {
             saveChanges();
             if ( !m_gameStarted ) { // no confirm needed 
                 applyChanges( true );