Added uniqueType to some more errors