diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index d81288f3..9352cbe5 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -81,8 +81,9 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		file = xstrdup(path);
 	else
 		xasprintf(&file, "%s/%s", cwd, path);
-	if (realpath(file, resolved) == NULL) {
-		cmdq_error(cmdq, "%s: %s", file, strerror(errno));
+	if (realpath(file, resolved) == NULL &&
+	    strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) {
+		cmdq_error(cmdq, "%s: %s", file, strerror(ENAMETOOLONG));
 		return (CMD_RETURN_ERROR);
 	}
 	f = fopen(resolved, "rb");
diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index 8de99075..9f3deeda 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -107,8 +107,9 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 		file = xstrdup(path);
 	else
 		xasprintf(&file, "%s/%s", cwd, path);
-	if (realpath(file, resolved) == NULL)  {
-		cmdq_error(cmdq, "%s: %s", file, strerror(errno));
+	if (realpath(file, resolved) == NULL &&
+	    strlcpy(resolved, file, sizeof resolved) >= sizeof resolved) {
+		cmdq_error(cmdq, "%s: %s", file, strerror(ENAMETOOLONG));
 		return (CMD_RETURN_ERROR);
 	}
 	f = fopen(resolved, flags);