Took out some error testing code that should be controlled by
a debug or verbose flag.