All the exceptions are now thrown from within an if statement