diff --git a/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidLocationUtilsFactory.java b/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidLocationUtilsFactory.java
index b010506f53dada8241dbfdcd17684600d2cb0071..0708ffa218a5e0ebf9f30c74cd36784f2134af25 100644
--- a/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidLocationUtilsFactory.java
+++ b/onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidLocationUtilsFactory.java
@@ -2,9 +2,12 @@ package org.briarproject.onionwrapper;
 
 import android.app.Application;
 
+import org.briarproject.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
 public class AndroidLocationUtilsFactory {
 
-    public static AndroidLocationUtils createAndroidLocationUtils(Application app) {
+    public static LocationUtils createAndroidLocationUtils(Application app) {
         return new AndroidLocationUtils(app);
     }
 
diff --git a/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaLocationUtilsFactory.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaLocationUtilsFactory.java
index 3529326e0ab5d8482ddf5756ae26e0eba2d2c99d..34b5f16a182b10af61b526d84883f1dee1ae1808 100644
--- a/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaLocationUtilsFactory.java
+++ b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaLocationUtilsFactory.java
@@ -1,8 +1,11 @@
 package org.briarproject.onionwrapper;
 
+import org.briarproject.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
 public class JavaLocationUtilsFactory {
 
-    public static JavaLocationUtils createJavaLocationUtils() {
+    public static LocationUtils createJavaLocationUtils() {
         return new JavaLocationUtils();
     }