diff --git a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
index 6bfa9686..b92831d3 100644
--- a/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
+++ b/common/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
@@ -6,13 +6,13 @@
 python __anonymous () {
     import re
     xserver = d.getVar('XSERVER', True)
-    if 'emgd-driver-bin' in xserver.split(' '):
+    if xserver and 'emgd-driver-bin' in xserver.split(' '):
         extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
-	take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
-	put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
+        take_out = ["--enable-egl", "--enable-gles1", "--enable-gles2"]
+        put_in = ["--disable-egl", "--disable-gles1", "--disable-gles2"]
         pattern = re.compile("--with-egl-platforms")
         new_extra_oeconf = [ ]
-	for i in extra_oeconf:
+        for i in extra_oeconf:
             if ( i not in take_out ) and ( not pattern.match(i)):
                 new_extra_oeconf.append(i)
         for i in put_in: