Add some error handling around file parsing.

[tspurds]

AFAIKT, None values are expected to be stored, so this I erred on the side of caution and kept returning them instead of filtering them out.