diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml
index 9f6939d92..ce5ff9975 100644
--- a/.github/workflows/ghpages.yml
+++ b/.github/workflows/ghpages.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: 'Upload the artifacts'
       if: github.ref_name == env.GIT_LATEST_TAG
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v2
       with:
         path: "_build/doc/html-out"
 
diff --git a/va/va_trace.c b/va/va_trace.c
index 3133114b1..0cd76da51 100644
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -6389,12 +6389,14 @@ void va_TraceExportSurfaceHandle(
     va_TraceMsg(trace_ctx, "\tflags     = 0x%08x\n", flags);
 
     if (memType != VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2) {
+        DPY2TRACE_VIRCTX_EXIT(pva_trace);
         return;
     }
 
     VADRMPRIMESurfaceDescriptor *desc = (VADRMPRIMESurfaceDescriptor *)descriptor;
 
     if (!desc) {
+        DPY2TRACE_VIRCTX_EXIT(pva_trace);
         return;
     }