Index: src/OFMutableURL.m
==================================================================
--- src/OFMutableURL.m
+++ src/OFMutableURL.m
@@ -56,12 +56,13 @@
 
 - (void)setURLEncodedScheme: (OFString *)URLEncodedScheme
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedScheme,
-	    [OFCharacterSet URLSchemeAllowedCharacterSet]);
+	if (URLEncodedScheme != nil)
+		of_url_verify_escaped(URLEncodedScheme,
+		    [OFCharacterSet URLSchemeAllowedCharacterSet]);
 
 	old = _URLEncodedScheme;
 	_URLEncodedScheme = [URLEncodedScheme copy];
 	[old release];
 }
@@ -81,12 +82,13 @@
 
 - (void)setURLEncodedHost: (OFString *)URLEncodedHost
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedHost,
-	    [OFCharacterSet URLHostAllowedCharacterSet]);
+	if (URLEncodedHost != nil)
+		of_url_verify_escaped(URLEncodedHost,
+		    [OFCharacterSet URLHostAllowedCharacterSet]);
 
 	old = _URLEncodedHost;
 	_URLEncodedHost = [URLEncodedHost copy];
 	[old release];
 }
@@ -113,12 +115,13 @@
 
 - (void)setURLEncodedUser: (OFString *)URLEncodedUser
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedUser,
-	    [OFCharacterSet URLUserAllowedCharacterSet]);
+	if (URLEncodedUser != nil)
+		of_url_verify_escaped(URLEncodedUser,
+		    [OFCharacterSet URLUserAllowedCharacterSet]);
 
 	old = _URLEncodedUser;
 	_URLEncodedUser = [URLEncodedUser copy];
 	[old release];
 }
@@ -139,12 +142,13 @@
 
 - (void)setURLEncodedPassword: (OFString *)URLEncodedPassword
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedPassword,
-	    [OFCharacterSet URLPasswordAllowedCharacterSet]);
+	if (URLEncodedPassword != nil)
+		of_url_verify_escaped(URLEncodedPassword,
+		    [OFCharacterSet URLPasswordAllowedCharacterSet]);
 
 	old = _URLEncodedPassword;
 	_URLEncodedPassword = [URLEncodedPassword copy];
 	[old release];
 }
@@ -164,12 +168,13 @@
 
 - (void)setURLEncodedPath: (OFString *)URLEncodedPath
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedPath,
-	    [OFCharacterSet URLPathAllowedCharacterSet]);
+	if (URLEncodedPath != nil)
+		of_url_verify_escaped(URLEncodedPath,
+		    [OFCharacterSet URLPathAllowedCharacterSet]);
 
 	old = _URLEncodedPath;
 	_URLEncodedPath = [URLEncodedPath copy];
 	[old release];
 }
@@ -209,12 +214,13 @@
 
 - (void)setURLEncodedQuery: (OFString *)URLEncodedQuery
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedQuery,
-	    [OFCharacterSet URLQueryAllowedCharacterSet]);
+	if (URLEncodedQuery != nil)
+		of_url_verify_escaped(URLEncodedQuery,
+		    [OFCharacterSet URLQueryAllowedCharacterSet]);
 
 	old = _URLEncodedQuery;
 	_URLEncodedQuery = [URLEncodedQuery copy];
 	[old release];
 }
@@ -235,12 +241,13 @@
 
 - (void)setURLEncodedFragment: (OFString *)URLEncodedFragment
 {
 	OFString *old;
 
-	of_url_verify_escaped(URLEncodedFragment,
-	    [OFCharacterSet URLFragmentAllowedCharacterSet]);
+	if (URLEncodedFragment != nil)
+		of_url_verify_escaped(URLEncodedFragment,
+		    [OFCharacterSet URLFragmentAllowedCharacterSet]);
 
 	old = _URLEncodedFragment;
 	_URLEncodedFragment = [URLEncodedFragment copy];
 	[old release];
 }