Exceptions

indentation change? also, should probably use || rather than the silly word