[Bug Fix] #389182 Fixes NPE