Removed more of the aggressive error checking