Fix mecha NullPointers