added a couple of exceptions