More stringent error checking.
Squash warnings.