diff -r 3f841a46eab5 -r 219c7ea94a42 librazor/atomic-actions.c
--- a/librazor/atomic-actions.c	Fri Oct 17 10:10:57 2014 +0100
+++ b/librazor/atomic-actions.c	Fri Jun 10 17:54:20 2016 +0100
@@ -365,9 +365,20 @@
 	free(newbuf);
 	free(oldbuf);
 #else
+	int code;
+	const char *object;
+
 	if (rename(path, dest)) {
-		if (!atomic->error)
-			atomic->error = razor_error_new_posix(dest);
+		if (!atomic->error) {
+			code = errno;
+			if (access(path, F_OK) < 0)
+				object = path;
+			else
+				object = dest;
+			atomic->error = razor_error_new_str(RAZOR_POSIX_ERROR,
+							    code, object,
+							    strerror(code));
+		}
 		return -1;
 	}
 #endif