diff --git a/common/iobuf.c b/common/iobuf.c
index f9c788a7b..a5b8d5955 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -2420,7 +2420,7 @@ iobuf_get_filelength (iobuf_t a, int *overflow)
 	  return size;
       }
     log_error ("GetFileSize for handle %p failed: %s\n",
-	       fp, w32_strerror (0));
+	       fp, w32_strerror (-1));
 #else /*!HAVE_W32_SYSTEM*/
     {
       struct stat st;
diff --git a/common/stringhelp.c b/common/stringhelp.c
index 3424048f9..d7bb6bc37 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -789,6 +789,12 @@ w32_strerror (int ec)
   FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, ec,
                  MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
                  strerr, DIM (strerr)-1, NULL);
+  {
+    /* Strip the CR,LF - we want just the string.  */
+    size_t n = strlen (strerr);
+    if (n > 2 && strerr[n-2] == '\r' && strerr[n-1] == '\n' )
+      strerr[n-2] = 0;
+  }
 #endif
   return strerr;
 }