Fixed Genie Lamp Component indexes
Fixed potential NPE