Renamed one of the exceptions, added some constants