Null check to fix Bug 402623