2 files changed, 11 insertions, 13 deletions

diff --git a/jim-aio.c b/jim-aio.c
index 62a6146..6ec95ca 100644
--- a/jim-aio.c
+++ b/jim-aio.c
@@ -1460,7 +1460,7 @@ int Jim_MakeTempFile(Jim_Interp *interp, const char *template)
     fd = mkstemp(filenameObj->bytes);
     umask(mask);
     if (fd < 0) {
-        Jim_SetResultString(interp, "Failed to create tempfile", -1);
+        JimAioSetError(interp, filenameObj);
         Jim_FreeNewObj(interp, filenameObj);
         return -1;
     }
@@ -1468,7 +1468,7 @@ int Jim_MakeTempFile(Jim_Interp *interp, const char *template)
     Jim_SetResult(interp, filenameObj);
     return fd;
 #else
-    Jim_SetResultString(interp, "tempfile not supported", -1);
+    Jim_SetResultString(interp, "platform has no tempfile support", -1);
     return -1;
 #endif
 }
diff --git a/jim-exec.c b/jim-exec.c
index e952ee7..47b327a 100644
--- a/jim-exec.c
+++ b/jim-exec.c
@@ -1578,18 +1578,16 @@ static int JimCreateTemp(Jim_Interp *interp, const char *contents, int len)
 {
     int fd = Jim_MakeTempFile(interp, NULL);
 
-    if (fd == JIM_BAD_FD) {
-        Jim_SetResultErrno(interp, "couldn't create temp file");
-        return -1;
-    }
-    unlink(Jim_String(Jim_GetResult(interp)));
-    if (contents) {
-        if (write(fd, contents, len) != len) {
-            Jim_SetResultErrno(interp, "couldn't write temp file");
-            close(fd);
-            return -1;
+    if (fd != JIM_BAD_FD) {
+        unlink(Jim_String(Jim_GetResult(interp)));
+        if (contents) {
+            if (write(fd, contents, len) != len) {
+                Jim_SetResultErrno(interp, "couldn't write temp file");
+                close(fd);
+                return -1;
+            }
+            lseek(fd, 0L, SEEK_SET);
         }
-        lseek(fd, 0L, SEEK_SET);
     }
     return fd;
 }