diff --git a/frmts/mrf/mrf_band.cpp b/frmts/mrf/mrf_band.cpp
index d4f71a7cd041..21e6dad1b6ba 100644
--- a/frmts/mrf/mrf_band.cpp
+++ b/frmts/mrf/mrf_band.cpp
@@ -898,7 +898,16 @@ CPLErr MRFRasterBand::FetchClonedBlock(int xblk, int yblk, void *buffer)
     MRFDataset *poSrc = static_cast<MRFDataset *>(poMRFDS->GetSrcDS());
     if (nullptr == poSrc)
     {
-        CPLError(CE_Failure, CPLE_AppDefined, "MRF: Can't open source file %s",
+        CPLError(CE_Failure, CPLE_AppDefined, "MRF: Can't open source %s",
+                 poMRFDS->source.c_str());
+        return CE_Failure;
+    }
+    // Check that the source is an MRF
+    auto srcDriver = poSrc->GetDriver();
+    if (srcDriver == nullptr || !EQUAL(srcDriver->GetDescription(), "MRF"))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "MRF: Cloned source %s is not an MRF",
                  poMRFDS->source.c_str());
         return CE_Failure;
     }
@@ -908,11 +917,35 @@ CPLErr MRFRasterBand::FetchClonedBlock(int xblk, int yblk, void *buffer)
         // Can't store, so just fetch from source, which is an MRF with
         // identical structure
         MRFRasterBand *b =
-            static_cast<MRFRasterBand *>(poSrc->GetRasterBand(nBand));
+            reinterpret_cast<MRFRasterBand *>(poSrc->GetRasterBand(nBand));
+
+        // Check the datatype and structure of the bands
+        // This is a sanity check, the source is lazy opened
+        if (b == nullptr || poSrc->GetRasterCount() != poMRFDS->nBands ||
+            poSrc->GetRasterXSize() != poMRFDS->full.size.x ||
+            poSrc->GetRasterYSize() != poMRFDS->full.size.y)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "MRF: Cloned source %s doesn't have the same structure",
+                     poMRFDS->source.c_str());
+            return CE_Failure;
+        }
+
+        // Switch to overview if needed
         if (b->GetOverviewCount() && m_l)
             b = static_cast<MRFRasterBand *>(b->GetOverview(m_l - 1));
         if (b == nullptr)
             return CE_Failure;
+
+        // One last check, blocksize and type matches
+        int bsx, bsy;
+        b->GetBlockSize(&bsx, &bsy);
+        if (bsx != img.pagesize.x || bsy != img.pagesize.y ||
+            b->GetRasterDataType() != eDataType)
+        {
+            return CE_Failure;
+        }
+
         return b->IReadBlock(xblk, yblk, buffer);
     }
 
diff --git a/frmts/mrf/mrf_util.cpp b/frmts/mrf/mrf_util.cpp
index b2b7b2bcd5a4..75cc83618b4a 100644
--- a/frmts/mrf/mrf_util.cpp
+++ b/frmts/mrf/mrf_util.cpp
@@ -679,6 +679,10 @@ void GDALRegister_MRF()
         "optimization\n"
 #if defined(BRUNSLI)
         "       JFIF - boolean, for JPEG, disable brunsli encoding\n"
+#endif
+#if defined(QB3_SUPPORT)
+        "       QB3_BAND_MAP - space separted list of band indices for "
+        "band to band decorrelation\n"
 #endif
         "'/>"
         "</CreationOptionList>\n");