diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index b18b227142..9111a4a0d4 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -966,18 +966,18 @@ EXTRA_DIST += \
 	tests/elementary/elm_test_helper.h
 
 
-# if HAVE_ELUA
+if HAVE_ELUA
 
-# elementary_eolian_lua = $(elm_eolian_files:%.eo=%.eo.lua)
+elementary_eolian_lua = $(elm_eolian_files:%.eo=%.eo.lua)
 
-# generated_elementary_lua_all = $(elementary_eolian_lua)
+generated_elementary_lua_all = $(elementary_eolian_lua)
 
-# CLEANFILES += $(generated_elementary_lua_all)
+CLEANFILES += $(generated_elementary_lua_all)
 
-# installed_elementaryluadir = $(datadir)/elua/modules/elementary
-# nodist_installed_elementarylua_DATA = $(generated_elementary_lua_all)
+installed_elementaryluadir = $(datadir)/elua/modules/elementary
+nodist_installed_elementarylua_DATA = $(generated_elementary_lua_all)
 
-# endif
+endif
 
 if HAVE_JS
 
diff --git a/src/scripts/elua/modules/lualian.lua b/src/scripts/elua/modules/lualian.lua
index b54d01656f..8ea6f24edf 100644
--- a/src/scripts/elua/modules/lualian.lua
+++ b/src/scripts/elua/modules/lualian.lua
@@ -55,6 +55,9 @@ local num_others = {
 }
 
 local is_num = function(x)
+    if not x then
+        return false
+    end
     if num_others [x       ] then return true end
     if int_builtin[x       ] then return true end
     if int_builtin["u" .. x] then return true end