fixed other exception rescue stuff