diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 09b424842..ec8543e96 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -22,7 +22,7 @@
      to come from a domain that you own or have control over. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.eehouse.android.xw4"
-          android:versionCode="79"
+          android:versionCode="80"
           android:versionName="@string/app_version"
           >
 
diff --git a/xwords4/android/XWords4/res/layout-small/board.xml b/xwords4/android/XWords4/res/layout-small/board.xml
index 610c8df8f..066ec68be 100644
--- a/xwords4/android/XWords4/res/layout-small/board.xml
+++ b/xwords4/android/XWords4/res/layout-small/board.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/board_root"
               android:orientation="vertical"
               android:layout_width="fill_parent" 
               android:layout_height="fill_parent"
diff --git a/xwords4/android/XWords4/res/raw/changes b/xwords4/android/XWords4/res/raw/changes
index 9940d2d79..965cdc51c 100644
--- a/xwords4/android/XWords4/res/raw/changes
+++ b/xwords4/android/XWords4/res/raw/changes
@@ -5,12 +5,14 @@
 </style>
 </head>
 <body>
-<b>Crosswords 4.4 beta 86 release</b>
+<b>Crosswords 4.4 beta 87 release</b>
 
-<h3>New with this (and prev.) release</h3>
+<h3>New with this (and prev.) releases</h3>
 <ul>
     <li>Don't prevent board displaying in the landscape orientation on
     large and x-large devices (tablets)</li>
+    <li>Fix changes for above to not crash on small-screened phones
+    (thanks Anonymous)</li>
     <li>Fix changes for above so Nexus 10 and other x-large devices
     still use the full screen in the portrait orientation (thanks DS)</li>
     <li>Fix reported crash in new toolbar code (thanks Anonymous)</li>
diff --git a/xwords4/android/XWords4/res/values/app_name.xml b/xwords4/android/XWords4/res/values/app_name.xml
index c06726f30..68ba83b9b 100644
--- a/xwords4/android/XWords4/res/values/app_name.xml
+++ b/xwords4/android/XWords4/res/values/app_name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="app_version">4.4 beta 86</string>
+  <string name="app_version">4.4 beta 87</string>
 </resources>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
index 01acaa018..76dbe5511 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -519,10 +519,14 @@ public class BoardDelegate extends DelegateBase
         m_view = (BoardView)findViewById( R.id.board_view );
         if ( ! ABUtils.haveActionBar() ) {
             m_tradeButtons = findViewById( R.id.exchange_buttons );
-            m_exchCommmitButton = (Button)findViewById( R.id.exchange_commit );
-            m_exchCommmitButton.setOnClickListener( this );
-            m_exchCancelButton = (Button)findViewById( R.id.exchange_cancel );
-            m_exchCancelButton.setOnClickListener( this );
+            if ( null != m_tradeButtons ) {
+                m_exchCommmitButton = (Button)
+                    findViewById( R.id.exchange_commit );
+                m_exchCommmitButton.setOnClickListener( this );
+                m_exchCancelButton = (Button)
+                    findViewById( R.id.exchange_cancel );
+                m_exchCancelButton.setOnClickListener( this );
+            }
         }
         m_volKeysZoom = XWPrefs.getVolKeysZoom( m_activity );
 
@@ -1855,9 +1859,11 @@ public class BoardDelegate extends DelegateBase
                         setTitle( GameUtils.getName( m_activity, m_rowid ) );
                     }
 
-                    int orient = m_activity.getResources().getConfiguration().orientation;
-                    boolean isLandscape = Configuration.ORIENTATION_LANDSCAPE == orient;
-                    m_toolbar = new Toolbar( m_activity, this, isLandscape );
+                    if ( null != findViewById( R.id.tbar_parent_hor ) ) {
+                        int orient = m_activity.getResources().getConfiguration().orientation;
+                        boolean isLandscape = Configuration.ORIENTATION_LANDSCAPE == orient;
+                        m_toolbar = new Toolbar( m_activity, this, isLandscape );
+                    }
 
                     populateToolbar();
                     adjustTradeVisibility();
@@ -1907,47 +1913,49 @@ public class BoardDelegate extends DelegateBase
 
     private void populateToolbar()
     {
-        m_toolbar.setListener( Toolbar.BUTTON_BROWSE_DICT,
-                               R.string.not_again_browseall,
-                               R.string.key_na_browseall,
-                               Action.BUTTON_BROWSEALL_ACTION );
-        m_toolbar.setLongClickListener( Toolbar.BUTTON_BROWSE_DICT,
-                                        R.string.not_again_browse,
-                                        R.string.key_na_browse,
-                                        Action.BUTTON_BROWSE_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_HINT_PREV, 
-                               R.string.not_again_hintprev,
-                               R.string.key_notagain_hintprev,
-                               Action.PREV_HINT_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_HINT_NEXT,
-                               R.string.not_again_hintnext,
-                               R.string.key_notagain_hintnext,
-                               Action.NEXT_HINT_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_JUGGLE,
-                               R.string.not_again_juggle,
-                               R.string.key_notagain_juggle,
-                               Action.JUGGLE_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_FLIP,
-                               R.string.not_again_flip,
-                               R.string.key_notagain_flip,
-                               Action.FLIP_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_ZOOM,
-                               R.string.not_again_zoom,
-                               R.string.key_notagain_zoom,
-                               Action.ZOOM_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_VALUES,
-                               R.string.not_again_values,
-                               R.string.key_na_values,
-                               Action.VALUES_ACTION );
-        m_toolbar.setListener( Toolbar.BUTTON_UNDO,
-                               R.string.not_again_undo,
-                               R.string.key_notagain_undo,
-                               Action.UNDO_ACTION );
-        if ( BuildConstants.CHAT_SUPPORTED ) {
-            m_toolbar.setListener( Toolbar.BUTTON_CHAT,
-                                   R.string.not_again_chat, 
-                                   R.string.key_notagain_chat,
-                                   Action.CHAT_ACTION );
+        if ( null != m_toolbar ) {
+            m_toolbar.setListener( Toolbar.BUTTON_BROWSE_DICT,
+                                   R.string.not_again_browseall,
+                                   R.string.key_na_browseall,
+                                   Action.BUTTON_BROWSEALL_ACTION );
+            m_toolbar.setLongClickListener( Toolbar.BUTTON_BROWSE_DICT,
+                                            R.string.not_again_browse,
+                                            R.string.key_na_browse,
+                                            Action.BUTTON_BROWSE_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_HINT_PREV, 
+                                   R.string.not_again_hintprev,
+                                   R.string.key_notagain_hintprev,
+                                   Action.PREV_HINT_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_HINT_NEXT,
+                                   R.string.not_again_hintnext,
+                                   R.string.key_notagain_hintnext,
+                                   Action.NEXT_HINT_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_JUGGLE,
+                                   R.string.not_again_juggle,
+                                   R.string.key_notagain_juggle,
+                                   Action.JUGGLE_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_FLIP,
+                                   R.string.not_again_flip,
+                                   R.string.key_notagain_flip,
+                                   Action.FLIP_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_ZOOM,
+                                   R.string.not_again_zoom,
+                                   R.string.key_notagain_zoom,
+                                   Action.ZOOM_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_VALUES,
+                                   R.string.not_again_values,
+                                   R.string.key_na_values,
+                                   Action.VALUES_ACTION );
+            m_toolbar.setListener( Toolbar.BUTTON_UNDO,
+                                   R.string.not_again_undo,
+                                   R.string.key_notagain_undo,
+                                   Action.UNDO_ACTION );
+            if ( BuildConstants.CHAT_SUPPORTED ) {
+                m_toolbar.setListener( Toolbar.BUTTON_CHAT,
+                                       R.string.not_again_chat, 
+                                       R.string.key_notagain_chat,
+                                       Action.CHAT_ACTION );
+            }
         }
     } // populateToolbar
 
@@ -2134,21 +2142,25 @@ public class BoardDelegate extends DelegateBase
 
     private void updateToolbar()
     {
-        m_toolbar.update( Toolbar.BUTTON_FLIP, m_gsi.visTileCount >= 1 );
-        m_toolbar.update( Toolbar.BUTTON_VALUES, m_gsi.visTileCount >= 1 );
-        m_toolbar.update( Toolbar.BUTTON_JUGGLE, m_gsi.canShuffle );
-        m_toolbar.update( Toolbar.BUTTON_UNDO, m_gsi.canRedo );
-        m_toolbar.update( Toolbar.BUTTON_HINT_PREV, m_gsi.canHint );
-        m_toolbar.update( Toolbar.BUTTON_HINT_NEXT, m_gsi.canHint );
-        m_toolbar.update( Toolbar.BUTTON_CHAT, 
-                          BuildConstants.CHAT_SUPPORTED && m_gsi.canChat );
-        m_toolbar.update( Toolbar.BUTTON_BROWSE_DICT, 
-                          null != m_gi.dictName( m_view.getCurPlayer() ) );
+        if ( null != m_toolbar ) {
+            m_toolbar.update( Toolbar.BUTTON_FLIP, m_gsi.visTileCount >= 1 );
+            m_toolbar.update( Toolbar.BUTTON_VALUES, m_gsi.visTileCount >= 1 );
+            m_toolbar.update( Toolbar.BUTTON_JUGGLE, m_gsi.canShuffle );
+            m_toolbar.update( Toolbar.BUTTON_UNDO, m_gsi.canRedo );
+            m_toolbar.update( Toolbar.BUTTON_HINT_PREV, m_gsi.canHint );
+            m_toolbar.update( Toolbar.BUTTON_HINT_NEXT, m_gsi.canHint );
+            m_toolbar.update( Toolbar.BUTTON_CHAT, 
+                              BuildConstants.CHAT_SUPPORTED && m_gsi.canChat );
+            m_toolbar.update( Toolbar.BUTTON_BROWSE_DICT, 
+                              null != m_gi.dictName( m_view.getCurPlayer() ) );
+        }
     }
 
     private void adjustTradeVisibility()
     {
-        m_toolbar.setVisible( !m_inTrade );
+        if ( null != m_toolbar ) {
+            m_toolbar.setVisible( !m_inTrade );
+        }
         if ( null != m_tradeButtons ) {
             m_tradeButtons.setVisibility( m_inTrade? View.VISIBLE : View.GONE );
         }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java
index a13f92704..e624f2643 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java
@@ -160,9 +160,11 @@ public class Toolbar {
 
             int id = isLandscape ? R.id.tbar_parent_vert : R.id.tbar_parent_hor;
             ViewGroup scroller = (ViewGroup)m_activity.findViewById( id );
-            // Google's had reports of a crash adding second view
-            scroller.removeAllViews();
-            scroller.addView( m_layout ); // failing
+            if ( null != scroller ) {
+                // Google's had reports of a crash adding second view
+                scroller.removeAllViews();
+                scroller.addView( m_layout ); // failing
+            }
         }
 
         m_layout.setVisibility( m_visible? View.VISIBLE : View.GONE );
