fix to potential NPE