Fix for I6234a765

See bug 46040 comment 7 - check that the value is not undefined

Bug: 46040
Change-Id: Ieb2a92ef28355e3f91ebdf1794b333ff6d41fb50
Merge "Fix for I6234a765"