Added explicit exceptions to a couple excepts