Fix: more safety
Fix: Preventing "comparing nil" CTD