@@ -25,11 +25,10 @@
 #import "OFDictionary.h"
 #import "OFNumber.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
-#import "OFInvalidEncodingException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOpenItemFailedException.h"
 
 #ifdef OF_AMIGAOS
 # include <proto/dos.h>
@@ -63,11 +62,11 @@
 			@try {
 				if (encoding != NULL)
 					*encoding = of_string_parse_encoding(
 					    [OFString stringWithCString: tmp
 							       encoding: enc]);
-			} @catch (OFInvalidEncodingException *e) {
+			} @catch (OFInvalidArgumentException *e) {
 			}
 		}
 
 		/* Territory */
 		if ((tmp = strrchr(locale, '_')) != NULL) {
@@ -431,11 +430,11 @@
 
 			@try {
 				_encoding = of_string_parse_encoding(
 				    [OFString stringWithCString: buffer
 						       encoding: ASCII]);
-			} @catch (OFInvalidEncodingException *e) {
+			} @catch (OFInvalidArgumentException *e) {
 				_encoding = OF_STRING_ENCODING_ISO_8859_1;
 			}
 		} else
 			_encoding = OF_STRING_ENCODING_ISO_8859_1;