Reverted back to old exception definitions