Added Unhandled Exception Support