Add more exception logging