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 f1d77b032..4ce7a69bc 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -545,7 +545,7 @@ public class BoardDelegate extends DelegateBase
         m_haveInvited = intent.getBooleanExtra( GameUtils.INVITED, false );
         m_overNotShown = true;
 
-        NFCUtils.register( m_activity ); // Don't seem to need to unregister...
+        NFCUtils.register( m_activity, this ); // Don't seem to need to unregister...
 
         setBackgroundColor();
         setKeepScreenOn();
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NFCUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NFCUtils.java
index c5ce1a971..78e625b81 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NFCUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NFCUtils.java
@@ -53,19 +53,17 @@ public class NFCUtils {
     }
 
     private static interface SafeNFC {
-        public void register( Activity activity );
+        public void register( Activity activity, NFCActor actor );
     }
 
     private static class SafeNFCImpl implements SafeNFC {
-        public void register( final Activity activity )
+        public void register( final Activity activity, final NFCActor actor )
         {
-            Assert.assertTrue( activity instanceof NFCActor );
             NfcManager manager = 
                 (NfcManager)activity.getSystemService( Context.NFC_SERVICE );
             if ( null != manager ) {
                 NfcAdapter adapter = manager.getDefaultAdapter();
                 if ( null != adapter ) {
-                    final NFCActor actor = (NFCActor)activity;
                     NfcAdapter.CreateNdefMessageCallback cb = 
                         new NfcAdapter.CreateNdefMessageCallback() {
                             public NdefMessage createNdefMessage( NfcEvent evt )
@@ -117,10 +115,10 @@ public class NFCUtils {
         return result;
     }
 
-    public static void register( Activity activity )
+    public static void register( Activity activity, NFCActor actor )
     {
         if ( null != s_safeNFC ) {
-            s_safeNFC.register( activity );
+            s_safeNFC.register( activity, actor );
         }
     }