Revert "More error checking."

This reverts commit 92868adb5519c8d6791091b2c9f731dc9f7fb11f.
More error checking.