diff --git a/manifest b/manifest
index 2d84c736a7..365d439600 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\senhancements\sfrom\strunk,\sincluding\sthe\snew\ssqlite3_value_dup()\sAPI\sand\nthe\saddition\sof\sthe\sapSqlParam\sfield\sin\sthe\ssqlite3_rtree_query_info\sobject\nof\sR-Tree.
-D 2015-05-22T23:26:18.963
+C Merge\sbug\sfixes\sfrom\strunk.
+D 2015-05-22T23:51:30.691
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 66db4ec2c6cd63d0f3e29d366aaaab769aba175b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -210,7 +210,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c 0eb4eb39e75be6170f1e59f7d6aabedaefb19938
+F src/btree.c d2bf38cf256bd2fcaa9ed87f2f217167d849fc1b
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
 F src/build.c d5d9090788118178190c5724c19f93953b8c7a4e
@@ -1249,7 +1249,7 @@ F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
 F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
-F tool/fuzzershell.c e35a3e0918349f2a9e0498c17c6fe5a6c7d61d86
+F tool/fuzzershell.c f2fc86dd22df654b28851b85019d3bd007361751
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
@@ -1297,7 +1297,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 7530e1bf557083ef91447a02f05b019dbe60fa70 10cc44f5a63e6cadf6940bb7310a177ee7fa6ee2
-R a152f3a145c4384cb72a92d8f9b69eb6
+P cdc0ca6fb36e787b981fb544a27c6df838f85704 c404fcace83613a50015f15097b7f28123c221c3
+R 957ffe62dcf25805db0612a32b474c17
 U drh
-Z 209f039a515a9e78b61cf9368c3a92c3
+Z cbbadb818c188a30c0fd9c403a8bf4fd
diff --git a/manifest.uuid b/manifest.uuid
index c37ac1326d..ef15aee619 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdc0ca6fb36e787b981fb544a27c6df838f85704
\ No newline at end of file
+519054bb72e8f8977b11161c81b0e96ba7bca589
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 6b7da394ac..01ce974d75 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6167,7 +6167,8 @@ static void rebuildPage(
     memcpy(pData, pCell, szCell[i]);
     put2byte(pCellptr, (pData - aData));
     pCellptr += 2;
-    assert( szCell[i]==cellSizePtr(pPg, pCell) );
+    assert( szCell[i]==cellSizePtr(pPg, pCell) || CORRUPT_DB );
+    testcase( szCell[i]!=cellSizePtr(pPg,pCell) );
   }
 
   /* The pPg->nFree field is now set incorrectly. The caller will fix it. */
diff --git a/tool/fuzzershell.c b/tool/fuzzershell.c
index 6890c0be1e..2778c9d2f7 100644
--- a/tool/fuzzershell.c
+++ b/tool/fuzzershell.c
@@ -454,7 +454,7 @@ int main(int argc, char **argv){
   int jj;                       /* Loop counter for azInFile[] */
   sqlite3_int64 iBegin;         /* Start time for the whole program */
   sqlite3_int64 iStart, iEnd;   /* Start and end-times for a test case */
-  const char *zDbName;          /* Name of an on-disk database file to open */
+  const char *zDbName = 0;      /* Name of an on-disk database file to open */
 
   iBegin = timeOfDay();
   zFailCode = getenv("TEST_FAILURE");
@@ -701,14 +701,17 @@ int main(int argc, char **argv){
       do{
         if( zDbName ){
           rc = sqlite3_open_v2(zDbName, &db, SQLITE_OPEN_READWRITE, 0);
+          if( rc!=SQLITE_OK ){
+            abendError("Cannot open database file %s", zDbName);
+          }
         }else{
           rc = sqlite3_open_v2(
             "main.db", &db,
             SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_MEMORY,
             0);
-        }
-        if( rc!=SQLITE_OK ){
-          abendError("Unable to open the in-memory database");
+          if( rc!=SQLITE_OK ){
+            abendError("Unable to open the in-memory database");
+          }
         }
         if( pLook ){
           rc = sqlite3_db_config(db, SQLITE_DBCONFIG_LOOKASIDE,pLook,szLook,nLook);