fixes all sorts of crashes in the generator
fixes all sorts of crashes in the generator

mrzl/ECO,mrzl/ECO,mrzl/ECO,mrzl/ECO,Schwittleymani/ECO,mrzl/ECO,Schwittleymani/ECO,Schwittleymani/ECO,Schwittleymani/ECO,Schwittleymani/ECO