diff --git a/src/libnm-base/nm-base.c b/src/libnm-base/nm-base.c
index 6e164908a..54d89e1f3 100644
--- a/src/libnm-base/nm-base.c
+++ b/src/libnm-base/nm-base.c
@@ -54,7 +54,8 @@ nm_dhcp_iaid_from_hexstr(const char *str, guint32 *out_value)
 const char *
 nm_net_devname_infiniband(char name[static NM_IFNAMSIZ], const char *parent_name, int p_key)
 {
-    g_return_val_if_fail(name, NULL);
+    nm_assert(name);
+
     g_return_val_if_fail(parent_name && parent_name[0], NULL);
     g_return_val_if_fail(strlen(parent_name) < NM_IFNAMSIZ, NULL);
 
diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c
index 1e7ed05b1..c313d22c2 100644
--- a/src/libnm-core-impl/nm-setting-wireguard.c
+++ b/src/libnm-core-impl/nm-setting-wireguard.c
@@ -311,10 +311,9 @@ _nm_wireguard_peer_set_public_key_bin(NMWireGuardPeer *self,
 {
     g_return_if_fail(NM_IS_WIREGUARD_PEER(self, FALSE));
 
-    nm_clear_g_free(&self->public_key);
+    nm_assert(public_key);
 
-    if (!public_key)
-        return;
+    nm_clear_g_free(&self->public_key);
 
     self->public_key       = g_base64_encode(public_key, NM_WIREGUARD_PUBLIC_KEY_LEN);
     self->public_key_valid = TRUE;