v0.1.1 - Fix NPE when helmet is null/air