diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
index 67bc0180..03249de7 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/AlertDialogFragment.kt
@@ -23,7 +23,7 @@ abstract class AlertDialogFragment<Arg : Parcelable, Ret : Parcelable> :
     }
     protected abstract fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener)
 
-    protected val arg by lazy { arguments!!.getParcelable<Arg>(KEY_ARG)!! }
+    protected val arg by lazy { requireArguments().getParcelable<Arg>(KEY_ARG)!! }
     protected open val ret: Ret? get() = null
     fun withArg(arg: Arg) = apply { arguments = Bundle().apply { putParcelable(KEY_ARG, arg) } }
 
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
index 86c21ae3..1f18ae78 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
@@ -219,7 +219,9 @@ class ClientsFragment : Fragment() {
         binding.swipeRefresher.setOnRefreshListener {
             IpNeighbourMonitor.instance?.flush()
         }
-        activityViewModels<ClientViewModel>().value.clients.observe(this) { adapter.submitList(it.toMutableList()) }
+        activityViewModels<ClientViewModel>().value.clients.observe(viewLifecycleOwner) {
+            adapter.submitList(it.toMutableList())
+        }
         return binding.root
     }