Bug Fix: #383002 - fix null point exception