@@ -28,19 +28,19 @@
 	OFString *path;
 	OFUNIXStreamSocket *sockClient, *sockServer, *sockAccepted;
 	char buffer[5];
 
 #if defined(OF_HAVE_FILES) && !defined(OF_IOS)
-	path = [[OFSystemInfo temporaryDirectoryURL]
-	    URLByAppendingPathComponent: [[OFUUID UUID] UUIDString]]
+	path = [[OFSystemInfo temporaryDirectoryURI]
+	    URIByAppendingPathComponent: [[OFUUID UUID] UUIDString]]
 	    .fileSystemRepresentation;
 #else
 	/*
 	 * We can have sockets, including UNIX sockets, while file support is
 	 * disabled.
 	 *
-	 * We also use this code path for iOS, as the temporaryDirectoryURL is
+	 * We also use this code path for iOS, as the temporaryDirectoryURI is
 	 * too long on the iOS simulator.
 	 */
 	path = [OFString stringWithFormat: @"/tmp/%@",
 					   [[OFUUID UUID] UUIDString]];
 #endif
@@ -48,11 +48,11 @@
 	TEST(@"+[socket]", (sockClient = [OFUNIXStreamSocket socket]) &&
 	    (sockServer = [OFUNIXStreamSocket socket]))
 
 	@try {
 		TEST(@"-[bindToPath:]", R([sockServer bindToPath: path]))
-	} @catch (OFBindFailedException *e) {
+	} @catch (OFBindSocketFailedException *e) {
 		switch (e.errNo) {
 		case EAFNOSUPPORT:
 		case EPERM:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine: