Changed empty strings to null.