merged mnmtanish-skip-uncaught-exception