@@ -212,14 +212,16 @@
 
 		if ([name isEqual: @"charset"])
 			charset = value;
 	}
 
-	@try {
-		ret = OFStringEncodingParseName(charset);
-	} @catch (OFInvalidArgumentException *e) {
-		ret = OFStringEncodingAutodetect;
+	ret = OFStringEncodingAutodetect;
+	if (charset != nil) {
+		@try {
+			ret = OFStringEncodingParseName(charset);
+		} @catch (OFInvalidArgumentException *e) {
+		}
 	}
 
 	return ret;
 }