diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 7691ff4e06..ace205e809 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -339,7 +339,7 @@ retrieve_session_id_cb (GObject *source_object,
 	NMPolkitListener *listener = NM_POLKIT_LISTENER (user_data);
 	char *session_id;
 	guint32 session_uid;
-	nm_auto_free_variant_iter GVariantIter *iter;
+	nm_auto_free_variant_iter GVariantIter *iter = NULL;
 	gs_unref_variant GVariant *ret = NULL;
 	gs_free_error GError *error = NULL;
 	gs_free char *err_str = NULL;
@@ -663,7 +663,7 @@ dbus_method_call_cb (GDBusConnection *connection,
 	const char *message;
 	const char *cookie;
 	AuthRequest *request;
-	gs_unref_variant GVariant *identities_gvariant;
+	gs_unref_variant GVariant *identities_gvariant = NULL;
 
 	if (nm_streq (method_name, "BeginAuthentication")) {
 		g_variant_get (parameters,
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 8bddbd23ea..7b69b4ef7a 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -5444,7 +5444,7 @@ attribute_escape (const char *src, char c1, char c2)
 {
 	char *ret, *dest;
 
-	dest = ret = malloc (strlen (src) * 2 + 1);
+	dest = ret = g_malloc (strlen (src) * 2 + 1);
 
 	while (*src) {
 		if (*src == c1 || *src == c2 || *src == '\\')
diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 64ce81ad3b..b59ba5f036 100644
--- a/libnm/nm-libnm-utils.h
+++ b/libnm/nm-libnm-utils.h
@@ -671,7 +671,8 @@ NML_IS_DBUS_OBJECT (NMLDBusObject *dbobj)
 	nm_assert (   !dbobj
 	           || (   NM_IS_REF_STRING (dbobj->dbus_path)
 	               && dbobj->ref_count > 0));
-	nm_assert (   !dbobj->nmobj
+	nm_assert (   !dbobj
+	           || !dbobj->nmobj
 	           || NM_IS_OBJECT (dbobj->nmobj)
 	           || NM_IS_CLIENT (dbobj->nmobj));
 	return !!dbobj;
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index 90d0cf0d3f..d437c82c6c 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -3103,7 +3103,7 @@ test_nm_auth_permissions (void)
 		g_assert (s == nm_auth_permission_names_by_idx[i - 1]);
 		g_assert_cmpint (nm_auth_permission_from_string (s), ==, i);
 	}
-	return;
+
 	for (i = 0; i < NM_CLIENT_PERMISSION_LAST; i++)
 		g_assert_cmpint (nm_auth_permission_from_string (nm_auth_permission_names_by_idx[i]), ==, i + 1);
 }
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index f2a1dd7875..cd63661d9a 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -1492,6 +1492,13 @@ svWriteFile (shvarFile *s, int mode, GError **error)
 			return FALSE;
 		}
 		f = fdopen (tmpfd, "w");
+		if (!f) {
+			errsv = errno;
+			g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errsv),
+			             "Internal error writing file '%s': %s",
+			             s->fileName, nm_strerror_native (errsv));
+			return FALSE;
+		}
 		fseek (f, 0, SEEK_SET);
 		c_list_for_each (current, &s->lst_head) {
 			const shvarLine *line = c_list_entry (current, shvarLine, lst);