diff --git a/mesh/keyring.c b/mesh/keyring.c
index b440911..d81e5e4 100644
--- a/mesh/keyring.c
+++ b/mesh/keyring.c
@@ -207,7 +207,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,
 
 	snprintf(key_file, PATH_MAX, "%s%s", node_path, dev_key_dir);
 
-	if (mkdir(key_file, 0755) != 0)
+	if (mkdir(key_file, 0755) != 0 && errno != EEXIST)
 		l_error("Failed to create dir(%d): %s", errno, key_file);
 
 	for (i = 0; i < count; i++) {
diff --git a/mesh/rpl.c b/mesh/rpl.c
index 6bb3532..1213ee6 100644
--- a/mesh/rpl.c
+++ b/mesh/rpl.c
@@ -80,7 +80,7 @@ bool rpl_put_entry(struct mesh_node *node, uint16_t src, uint32_t iv_index,
 	iv_index--;
 	snprintf(src_file, PATH_MAX, "%s%s/%8.8x/%4.4x", node_path, rpl_dir,
 								iv_index, src);
-	if (remove(src_file) < 0)
+	if (remove(src_file) < 0 && errno != ENOENT)
 		l_error("Failed to remove(%d): %s", errno, src_file);
 
 	return result;