Fix None hadnling in db values

Change-Id: Iada8000fe92fd8ef39168c94e9fd95f3c4375539