Basic error checking in place.

We're now on the 4th iteration.