Added exception that is always raised
This is a conflict-resolving commit