@@ -56,19 +56,19 @@
 #import "OFDeleteDirectoryFailedException.h"
 #import "OFDeleteFileFailedException.h"
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFLinkFailedException.h"
-#import "OFMutexLockFailedException.h"
-#import "OFMutexUnlockFailedException.h"
+#import "OFLockFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFOpenFileFailedException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFReadFailedException.h"
 #import "OFRenameFileFailedException.h"
 #import "OFSeekFailedException.h"
 #import "OFSymlinkFailedException.h"
+#import "OFUnlockFailedException.h"
 #import "OFWriteFailedException.h"
 
 #import "autorelease.h"
 #import "macros.h"
 
@@ -440,12 +440,11 @@
 		@throw [OFInvalidArgumentException exceptionWithClass: self
 							     selector: _cmd];
 
 # ifdef OF_THREADS
 	if (!of_mutex_lock(&mutex))
-		@throw [OFMutexLockFailedException exceptionWithClass: self
-								mutex: nil];
+		@throw [OFLockFailedException exceptionWithClass: self];
 
 	@try {
 # endif
 		if (owner != nil) {
 			struct passwd *passwd;
@@ -475,13 +474,12 @@
 			gid = group_->gr_gid;
 		}
 # ifdef OF_THREADS
 	} @finally {
 		if (!of_mutex_unlock(&mutex))
-			@throw [OFMutexUnlockFailedException
-			    exceptionWithClass: self
-					 mutex: nil];
+			@throw [OFUnlockFailedException
+			    exceptionWithClass: self];
 	}
 # endif
 
 	if (chown([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 	    uid, gid))