cleanup
fix NPE