Merge branch 'ssieb-master'

Jeija · Jeija · commit 2dc8101fa1ec · 2016-02-23T10:20:09.000+01:00
diff --git a/mesecons/internal.lua b/mesecons/internal.lua
@@ -357,15 +357,15 @@ end
 
 function mesecon.is_power_on(pos, rulename)
 	local node = mesecon.get_node_force(pos)
-	if mesecon.is_conductor_on(node, rulename) or mesecon.is_receptor_on(node.name) then
+	if node and (mesecon.is_conductor_on(node, rulename) or mesecon.is_receptor_on(node.name)) then
 		return true
 	end
 	return false
 end
 
 function mesecon.is_power_off(pos, rulename)
 	local node = mesecon.get_node_force(pos)
-	if mesecon.is_conductor_off(node, rulename) or mesecon.is_receptor_off(node.name) then
+	if node and (mesecon.is_conductor_off(node, rulename) or mesecon.is_receptor_off(node.name)) then
 		return true
 	end
 	return false
