Added check for null before dereference, for bug #14671

Change-Id: I30de6f43d8b208b7cdce2bbdf37b1593708148e2
Merge topic 'bug14671' into master

64e66d78 Added check for null before dereference, for bug #14671