[Bug Fix] #389588 Fix NPE