Possibly more useful error checking

Since it seems like it is legitimate for some values to be split
across multiple strings