Index: src/shell.c.in
==================================================================
--- src/shell.c.in
+++ src/shell.c.in
@@ -6386,11 +6386,11 @@
   }
 
  finished:
   sqlite3_close(dbtmp);
   *pRc = rc;
-  if( rc!=SQLITE_OK ){
+  if( rc!=SQLITE_OK || (pTab && pTab->zQuoted==0) ){
     recoverFreeTable(pTab);
     pTab = 0;
   }
   return pTab;
 }
@@ -6678,20 +6678,18 @@
   }
 
   /* Figure out if an orphan table will be required. And if so, how many
   ** user columns it should contain */
   shellPrepare(pState->db, &rc, 
-      "SELECT coalesce(max(maxlen), -2) FROM recovery.map" 
-      "  WHERE root>1 AND root NOT IN (SELECT rootpage FROM recovery.schema)"
+      "SELECT coalesce(max(maxlen), -2) FROM recovery.map WHERE root>1"
       , &pLoop
   );
   if( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pLoop) ){
     nOrphan = sqlite3_column_int(pLoop, 0);
   }
   shellFinalize(&rc, pLoop);
   pLoop = 0;
-  pOrphan = recoverOrphanTable(pState, &rc, zLostAndFound, nOrphan);
 
   shellPrepare(pState->db, &rc,
       "SELECT pgno FROM recovery.map WHERE root=?", &pPages
   );
   shellPrepare(pState->db, &rc,
@@ -6714,11 +6712,17 @@
     int bNoop = 0;
     RecoverTable *pTab;
 
     pTab = recoverFindTable(pState, &rc, iRoot, bIntkey, nCol, &bNoop);
     if( bNoop || rc ) continue;
-    if( pTab==0 ) pTab = pOrphan;
+    if( pTab==0 ){
+      if( pOrphan==0 ){
+        pOrphan = recoverOrphanTable(pState, &rc, zLostAndFound, nOrphan);
+      }
+      pTab = pOrphan;
+      if( pTab==0 ) break;
+    }
 
     if( 0==sqlite3_stricmp(pTab->zQuoted, "'sqlite_sequence'") ){
       raw_printf(pState->out, "DELETE FROM sqlite_sequence;\n");
     }
     sqlite3_bind_int(pPages, 1, iRoot);