Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,5 +1,5 @@
 all:
-	@objfw-compile -o scrypt-pwgen *.m
+	@objfw-compile -Werror -o scrypt-pwgen *.m
 
 clean:
 	rm -f *.o *~ scrypt-pwgen

Index: ScryptPWGen.m
==================================================================
--- ScryptPWGen.m
+++ ScryptPWGen.m
@@ -115,13 +115,13 @@
 	if (lengthStr != nil) {
 		bool invalid = false;
 
 		@try {
 			generator.length = (size_t)[lengthStr decimalValue];
-		} @catch (OFInvalidArgumentException *e) {
+		} @catch (OFInvalidFormatException *e) {
 			invalid = true;
-		} @catch (OFInvalidFormatException *e) {
+		} @catch (OFOutOfRangeException *e) {
 			invalid = true;
 		}
 
 		if (invalid) {
 			[of_stderr writeFormat:
@@ -134,21 +134,21 @@
 
 
 	prompt = [OFString stringWithFormat: @"Passphrase for site \"%@\": ",
 					     generator.site];
 	passphrase = getpass(
-	    [prompt cStringWithEncoding: [OFSystemInfo native8BitEncoding]]);
+	    [prompt cStringWithEncoding: [OFLocalization encoding]]);
 	@try {
 		if (_repeat) {
 			char *passphraseCopy = of_strdup(passphrase);
 
 			if (passphraseCopy == NULL)
 				@throw [OFOutOfMemoryException exception];
 
 			@try {
 				of_string_encoding_t encoding =
-				    [OFSystemInfo native8BitEncoding];
+				    [OFLocalization encoding];
 
 				prompt = [OFString stringWithFormat:
 				    @"Repeat passphrase for site \"%@\": ",
 				    generator.site];
 				passphrase = getpass(