fixed bug where null values wouldn't be turned into ""

Change-Id: Ie4501ef1d5d6db0b6b222b87da179edcf12ea893
fixed case sensitivity bug

Change-Id: I160893b97250522bf35d7a320455e64932e457d3