Added some more error checking

added some additional error checking for the simulator class.