Rescue and exception changes

Made everything a little more standard.