Fix a couple of exceptions.