Add more exception handling on match runner