- Fix NPE in /swp import