diff --git a/collect_app/src/main/java/org/odk/collect/android/formmanagement/CollectFormEntryControllerFactory.kt b/collect_app/src/main/java/org/odk/collect/android/formmanagement/CollectFormEntryControllerFactory.kt
index 93bcdcfb209..eb31fa179f3 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formmanagement/CollectFormEntryControllerFactory.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formmanagement/CollectFormEntryControllerFactory.kt
@@ -10,7 +10,7 @@ import org.odk.collect.shared.settings.Settings
 
 class CollectFormEntryControllerFactory constructor(private val settings: Settings) :
     FormEntryControllerFactory {
-    override fun create(formDef: FormDef?): FormEntryController {
+    override fun create(formDef: FormDef): FormEntryController {
         return FormEntryController(FormEntryModel(formDef)).also {
             it.addPostProcessor(EntityFormFinalizationProcessor())
 
diff --git a/collect_app/src/main/java/org/odk/collect/android/tasks/FormLoaderTask.java b/collect_app/src/main/java/org/odk/collect/android/tasks/FormLoaderTask.java
index 64a763e4898..ebe38699699 100644
--- a/collect_app/src/main/java/org/odk/collect/android/tasks/FormLoaderTask.java
+++ b/collect_app/src/main/java/org/odk/collect/android/tasks/FormLoaderTask.java
@@ -22,6 +22,8 @@
 import android.database.SQLException;
 import android.os.AsyncTask;
 
+import androidx.annotation.NonNull;
+
 import com.opencsv.CSVReader;
 import com.opencsv.exceptions.CsvValidationException;
 
@@ -574,6 +576,6 @@ public FormDef getFormDef() {
     }
 
     public interface FormEntryControllerFactory {
-        FormEntryController create(FormDef formDef);
+        FormEntryController create(@NonNull FormDef formDef);
     }
 }