Modifications in the exceptions