Add a couple of exceptions to avoid exiting from class methods