diff --git a/va/va_trace.c b/va/va_trace.c
index 7ececc088..4d051bab3 100644
--- a/va/va_trace.c
+++ b/va/va_trace.c
@@ -968,6 +968,8 @@ static void va_TraceVPrint(struct trace_context *trace_ctx, const char *msg, va_
         return;
 
     fp = trace_ctx->plog_file->fp_log;
+    if (!fp)
+        return;
     if (msg)  {
         vfprintf(fp, msg, args);
     } else
diff --git a/va/x11/va_dri2.c b/va/x11/va_dri2.c
index da2a9f40b..6d3637f81 100644
--- a/va/x11/va_dri2.c
+++ b/va/x11/va_dri2.c
@@ -303,6 +303,9 @@ VA_DRI2Buffer *VA_DRI2GetBuffers_internal(XExtDisplayInfo *info,
     CARD32 *p;
     int i;
 
+    if (!info->codes)
+        return NULL;
+
     GetReqExtra(DRI2GetBuffers, count * 4, req);
     req->reqType = info->codes->major_opcode;
     req->dri2ReqType = X_DRI2GetBuffers;