Fix for bug 1355033

When a null value is returned we are reading the varchar length which
could be garbage.  Fixed to not read varchar length when the data is
null value.

Change-Id: I733801dc39cab663dbf2534b0bee79bd773e8c14
Merge "Fix for bug 1355033"