Fixed serious issue regarding wether a failure was caught or not.
Also, changed name of simulator file.