Fix potential NPE in TileEnergyConverter
Merge pull request #1848 from Prototik/energy-converter-crash

Energy converter crash
Merge branch '6.0.x' into 6.1.x