More Exceptions - this one is right

Danny somehow undid all the exception fixes I did to his code. When he
unbreaks it again, this will be correct.