diff --git a/app/flatpak-builtins-utils.c b/app/flatpak-builtins-utils.c
index 26ba98ce..d1d979c4 100644
--- a/app/flatpak-builtins-utils.c
+++ b/app/flatpak-builtins-utils.c
@@ -1413,6 +1413,8 @@ ensure_remote_state_arch (FlatpakDir         *dir,
 {
   g_autoptr(GError) local_error = NULL;
 
+  g_return_val_if_fail (arch != NULL, FALSE);
+
   if (only_sideloaded)
     return TRUE;
 
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index d8042182..248368d4 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -604,6 +604,8 @@ flatpak_remote_state_ensure_subsummary (FlatpakRemoteState *self,
 
   g_autoptr(GBytes) bytes = NULL;
 
+  g_return_val_if_fail (arch != NULL, FALSE);
+
   if (self->summary != NULL)
     return TRUE; /* We have them all anyway */