diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index a320dfacb..32bd6af0c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -652,9 +652,11 @@ public class BoardDelegate extends DelegateBase
         super.onDestroy();
     }
 
+    @Override
     protected void onSaveInstanceState( Bundle outState )
     {
         outState.putSerializable( SAVE_MYSIS, m_mySIS );
+        super.onSaveInstanceState( outState );
     }
 
     private void getBundledData( Bundle bundle )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
index cf38d30e3..7c8ecaf9a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
@@ -458,10 +458,6 @@ public class MainActivity extends XWActivity
                         safeAddFragment( fragment, parentName );
                     }
                 } );
-            if ( BuildConfig.DEBUG ) {
-                DbgUtils.showf( this, "Putting off fragment construction; %d waiting",
-                                m_runWhenSafe.size() );
-            }
         }
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
index 1b985b186..50e410fcb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
@@ -53,15 +53,18 @@ public class XWDialogFragment extends DialogFragment {
 
         if ( null != m_buttonMap ) {
             AlertDialog dialog = (AlertDialog)getDialog();
-            for ( final int but : m_buttonMap.keySet() ) {
-                // final int fbut = but;
-                dialog.getButton( but )
-                    .setOnClickListener( new OnClickListener() {
-                            @Override
-                            public void onClick( View view ) {
-                                dialogButtonClicked( view, but );
-                            }
-                        } );
+            Assert.assertTrue( null != dialog || !BuildConfig.DEBUG );
+            if ( null != dialog) {
+                for ( final int but : m_buttonMap.keySet() ) {
+                    // final int fbut = but;
+                    dialog.getButton( but ) // NPE!!!
+                        .setOnClickListener( new OnClickListener() {
+                                @Override
+                                public void onClick( View view ) {
+                                    dialogButtonClicked( view, but );
+                                }
+                            } );
+                }
             }
         }
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
index a4c139077..8bb04952f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
@@ -84,7 +84,7 @@ abstract class XWFragment extends Fragment implements Delegator {
     @Override
     public void onSaveInstanceState( Bundle outState )
     {
-        Log.d( TAG, "%s.onCreate() called", getClass().getSimpleName() );
+        Log.d( TAG, "%s.onSaveInstanceState() called", getClass().getSimpleName() );
         Assert.assertNotNull( m_parentName );
         outState.putString( PARENT_NAME, m_parentName );
         m_dlgt.onSaveInstanceState( outState );