Possibly fix NPE with more consistent null/air item checking