diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index 693647426..e7695401e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -214,6 +214,8 @@ public class WiDirService extends XWService {
             sHavePermission = false;
         } catch ( SecurityException se ) {               // perm not in manifest
             sHavePermission = false;
+        } catch ( NullPointerException npe ) { // Seeing this on Oreo emulator
+            sHavePermission = false;
         }
     }
 
diff --git a/xwords4/android/jni/utilwrapper.c b/xwords4/android/jni/utilwrapper.c
index 4e948a906..03eab0bf4 100644
--- a/xwords4/android/jni/utilwrapper.c
+++ b/xwords4/android/jni/utilwrapper.c
@@ -702,10 +702,10 @@ and_dutil_deviceRegistered( XW_DUtilCtxt* duc, DevIDType typ,
                             const XP_UCHAR* idRelay )
 {
     DUTIL_CBK_HEADER( "deviceRegistered",
-                      "(L" PKG_PATH("jni/UtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
+                      "(L" PKG_PATH("jni/DUtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
     jstring jstr = (*env)->NewStringUTF( env, idRelay );
     jobject jtyp = intToJEnum( env, typ, 
-                               PKG_PATH("jni/UtilCtxt$DevIDType") );
+                               PKG_PATH("jni/DUtilCtxt$DevIDType") );
     (*env)->CallVoidMethod( env, dutil->jdutil, mid, jtyp, jstr );
     deleteLocalRefs( env, jstr, jtyp, DELETE_NO_REF );
     DUTIL_CBK_TAIL();