Whack a couple more exceptions.