Index: src/main.c
==================================================================
--- src/main.c
+++ src/main.c
@@ -2987,17 +2987,17 @@
   ** using the sqlite3_automatic_extension() API.
   */
   if( rc==SQLITE_OK ){
     sqlite3AutoLoadExtensions(db);
     rc = sqlite3_errcode(db);
+    if( rc!=SQLITE_OK ){
+      goto opendb_out;
+    }
   }
 
-  testcase( rc!=SQLITE_OK && rc!=SQLITE_NOMEM );
-  testcase( rc!=SQLITE_OK && !db->mallocFailed );
-
 #ifdef SQLITE_ENABLE_FTS1
-  if( !db->mallocFailed && rc==SQLITE_OK ){
+  if( !db->mallocFailed ){
     extern int sqlite3Fts1Init(sqlite3*);
     rc = sqlite3Fts1Init(db);
   }
 #endif
 
@@ -3036,27 +3036,27 @@
   if( !db->mallocFailed && rc==SQLITE_OK){
     rc = sqlite3Json1Init(db);
   }
 #endif
 
-  if( rc==SQLITE_OK ){
-    /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
-    ** mode.  -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
-    ** mode.  Doing nothing at all also makes NORMAL the default.
-    */
+  /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
+  ** mode.  -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
+  ** mode.  Doing nothing at all also makes NORMAL the default.
+  */
 #ifdef SQLITE_DEFAULT_LOCKING_MODE
-    db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE;
-    sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt),
-                            SQLITE_DEFAULT_LOCKING_MODE);
+  db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE;
+  sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt),
+                          SQLITE_DEFAULT_LOCKING_MODE);
 #endif
 
-    /* Enable the lookaside-malloc subsystem */
-    setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
-                          sqlite3GlobalConfig.nLookaside);
+  if( rc ) sqlite3Error(db, rc);
 
-    sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
-  }
+  /* Enable the lookaside-malloc subsystem */
+  setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
+                        sqlite3GlobalConfig.nLookaside);
+
+  sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
 
 opendb_out:
   if( db ){
     assert( db->mutex!=0 || isThreadsafe==0
            || sqlite3GlobalConfig.bFullMutex==0 );