Fixed exceptions which have moved