@@ -982,11 +982,11 @@
 				@throw [OFOutOfRangeException
 				    newWithClass: isa];
 
 			num = (num * 10) + (string[i] - '0');
 		} else
-			@throw [OFInvalidEncodingException newWithClass: isa];
+			@throw [OFInvalidFormatException newWithClass: isa];
 	}
 
 	if (string[0] == '-')
 		num *= -1;
 
@@ -1006,17 +1006,17 @@
 		i = 2;
 	else if (length >= 1 && (string[0] == 'x' || string[0] == '$'))
 		i = 1;
 
 	if (i == length)
-		@throw [OFInvalidEncodingException newWithClass: isa];
+		@throw [OFInvalidFormatException newWithClass: isa];
 
 	for (; i < length; i++) {
 		uintmax_t newnum;
 
 		if (suffix)
-			@throw [OFInvalidEncodingException newWithClass: isa];
+			@throw [OFInvalidFormatException newWithClass: isa];
 
 		if (string[i] >= '0' && string[i] <= '9')
 			newnum = (num << 4) | (string[i] - '0');
 		else if (string[i] >= 'A' && string[i] <= 'F')
 			newnum = (num << 4) | (string[i] - 'A' + 10);
@@ -1024,11 +1024,11 @@
 			newnum = (num << 4) | (string[i] - 'a' + 10);
 		else if (string[i] == 'h') {
 			suffix = YES;
 			continue;
 		} else
-			@throw [OFInvalidEncodingException newWithClass: isa];
+			@throw [OFInvalidFormatException newWithClass: isa];
 
 		if (newnum < num)
 			@throw [OFOutOfRangeException newWithClass: isa];
 
 		num = newnum;