diff --git a/va/va.c b/va/va.c
index d87661aae..15b3e5212 100644
--- a/va/va.c
+++ b/va/va.c
@@ -627,9 +627,10 @@ VAStatus vaSetDriverName(
     VADriverContextP ctx;
     VAStatus vaStatus = VA_STATUS_SUCCESS;
     char *override_driver_name = NULL;
+    CHECK_DISPLAY(dpy);
     ctx = CTX(dpy);
 
-    if (strlen(driver_name) == 0 || strlen(driver_name) >= 256) {
+    if (!driver_name || strlen(driver_name) == 0 || strlen(driver_name) >= 256) {
         vaStatus = VA_STATUS_ERROR_INVALID_PARAMETER;
         va_errorMessage(dpy, "vaSetDriverName returns %s\n",
                         vaErrorStr(vaStatus));
diff --git a/va/wayland/va_wayland.c b/va/wayland/va_wayland.c
index 759b05517..2f4c42cc9 100644
--- a/va/wayland/va_wayland.c
+++ b/va/wayland/va_wayland.c
@@ -116,6 +116,9 @@ vaGetDisplayWl(struct wl_display *display)
     struct VADriverVTableWayland *vtable;
     unsigned int i;
 
+    if (!display)
+        return NULL;
+
     pDisplayContext = va_newDisplayContext();
     if (!pDisplayContext)
         return NULL;