Add some basic error handling and remove tuples.

No need for tuples when the lists are going to be
so small. The speed difference between the two
will be minimal.