Check for null status when populating data (issue #17)