Resolved issue #36 by changing NULL values to empty strings