Modification ShutdownOnException