diff --git a/gui/Android.mk b/gui/Android.mk
index 32b1675..ac0b203 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -68,7 +68,7 @@
 LOCAL_CFLAGS += -DHAVE_SELINUX
 endif
 
-ifndef DEVICE_RESOLUTION
+ifeq ($(DEVICE_RESOLUTION),)
 $(warning ********************************************************************************)
 $(warning * DEVICE_RESOLUTION is NOT SET in BoardConfig.mk )
 $(warning * Please see http://tinyw.in/nP7d for details    )
@@ -76,6 +76,14 @@
 $(error stopping)
 endif
 
+ifeq "$(wildcard bootable/recovery/gui/devices/$(DEVICE_RESOLUTION))" ""
+$(warning ********************************************************************************)
+$(warning * DEVICE_RESOLUTION ($(DEVICE_RESOLUTION)) does NOT EXIST in bootable/recovery/gui/devices )
+$(warning * Please choose an existing theme or create a new one for your device )
+$(warning ********************************************************************************)
+$(error stopping)
+endif
+
 LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)
 
 include $(BUILD_STATIC_LIBRARY)