diff --git a/.github/workflows/cpp-ci-serial-programs-base.yml b/.github/workflows/cpp-ci-serial-programs-base.yml
index 09d52a5ba1..a42d99413a 100644
--- a/.github/workflows/cpp-ci-serial-programs-base.yml
+++ b/.github/workflows/cpp-ci-serial-programs-base.yml
@@ -132,18 +132,41 @@ jobs:
         cd Arduino-Source
 
         cat << 'EOF' > query.txt
-        set output dump
-        match invocation(
+        set output diag
+        match cxxConstructExpr(
           isExpansionInFileMatching("SerialPrograms/"),
           hasDeclaration(cxxConstructorDecl(ofClass(hasName("std::filesystem::path")))),
           hasArgument(0, hasType(asString("std::string")))
         )
+
+        match cxxConstructExpr(
+          isExpansionInFileMatching("SerialPrograms/"),
+          hasDeclaration(cxxConstructorDecl(ofClass(hasName("ImageViewRGB32")))),
+          hasArgument(0, hasType(rValueReferenceType(pointee(hasType(hasName("VideoSnapshot")))))),
+          unless(hasAncestor(functionDecl(isInline())))
+        )
         EOF
 
         files=$(jq -r '.[].file' SerialPrograms/bin/compile_commands.json)
-        echo "$files" | xargs --max-args=150 clang-query -p SerialPrograms/bin/ -f query.txt >> output.txt
-        cat output.txt
-        if grep --silent "Match #" output.txt; then
-          echo "::error Forbidden std::filesystem::path construction detected!"
+        echo "$files" | xargs --max-args=150 clang-query -p SerialPrograms/bin/ -f query.txt >> clang-query_output.txt
+
+        echo "Clang query output (begin)"
+        cat clang-query_output.txt
+        echo "Clang query output (end)"
+
+        if grep --silent "Match #" clang-query_output.txt; then
+          echo "::error Forbidden code detected! It can be one of the following:"
+          echo "::error - std::filesystem::path created from std::string. More information https://discord.com/channels/695809740428673034/1462210406616531259/1462567541825339635"
+          echo "::error - ImageViewRGB32 created from VideoSnapshot&& that is stored. It is a dangling pointer as nothing hold the data anymore"
+          echo "::error You can read more about the exact error with the artifact below."
           exit 1
         fi
+
+    - name: Upload Clang query output
+      uses: actions/upload-artifact@v7
+      if: inputs.run-clang-query && always()
+      with:
+        name: Clang query output (compiler=${{inputs.compiler}})
+        path: |
+          Arduino-Source/SerialPrograms/bin/compile_commands.json
+          Arduino-Source/clang-query_output.txt
\ No newline at end of file