etc
fix NPE
injection update