Kat Fix on 'NoneType' object is unsubscriptable
Merge remote-tracking branch 'upstream/Pistachitos' into Pistachitos