updated some possibles NPE