Index: Makefile.msc
==================================================================
--- Makefile.msc
+++ Makefile.msc
@@ -676,10 +676,11 @@
   $(TOP)\src\test_backup.c \
   $(TOP)\src\test_btree.c \
   $(TOP)\src\test_config.c \
   $(TOP)\src\test_demovfs.c \
   $(TOP)\src\test_devsym.c \
+  $(TOP)\src\test_fs.c \
   $(TOP)\src\test_func.c \
   $(TOP)\src\test_fuzzer.c \
   $(TOP)\src\test_hexio.c \
   $(TOP)\src\test_init.c \
   $(TOP)\src\test_intarray.c \

Index: ext/rtree/rtree.c
==================================================================
--- ext/rtree/rtree.c
+++ ext/rtree/rtree.c
@@ -3047,11 +3047,12 @@
 ** would fit in a single node, use a smaller node-size.
 */
 static int getNodeSize(
   sqlite3 *db,                    /* Database handle */
   Rtree *pRtree,                  /* Rtree handle */
-  int isCreate                    /* True for xCreate, false for xConnect */
+  int isCreate,                   /* True for xCreate, false for xConnect */
+  char **pzErr                    /* OUT: Error message, if any */
 ){
   int rc;
   char *zSql;
   if( isCreate ){
     int iPageSize = 0;
@@ -3060,17 +3061,22 @@
     if( rc==SQLITE_OK ){
       pRtree->iNodeSize = iPageSize-64;
       if( (4+pRtree->nBytesPerCell*RTREE_MAXCELLS)<pRtree->iNodeSize ){
         pRtree->iNodeSize = 4+pRtree->nBytesPerCell*RTREE_MAXCELLS;
       }
+    }else{
+      *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
     }
   }else{
     zSql = sqlite3_mprintf(
         "SELECT length(data) FROM '%q'.'%q_node' WHERE nodeno = 1",
         pRtree->zDb, pRtree->zName
     );
     rc = getIntFromStmt(db, zSql, &pRtree->iNodeSize);
+    if( rc!=SQLITE_OK ){
+      *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+    }
   }
 
   sqlite3_free(zSql);
   return rc;
 }
@@ -3130,11 +3136,11 @@
   pRtree->eCoordType = eCoordType;
   memcpy(pRtree->zDb, argv[1], nDb);
   memcpy(pRtree->zName, argv[2], nName);
 
   /* Figure out the node size to use. */
-  rc = getNodeSize(db, pRtree, isCreate);
+  rc = getNodeSize(db, pRtree, isCreate, pzErr);
 
   /* Create/Connect to the underlying relational database schema. If
   ** that is successful, call sqlite3_declare_vtab() to configure
   ** the r-tree table schema.
   */

Index: src/test_fs.c
==================================================================
--- src/test_fs.c
+++ src/test_fs.c
@@ -35,12 +35,18 @@
 
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
+
+#if SQLITE_OS_UNIX
+# include <unistd.h>
+#endif
+#if SQLITE_OS_WIN
+# include <io.h>
+#endif
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 
 typedef struct fs_vtab fs_vtab;
 typedef struct fs_cursor fs_cursor;