Index: src/exceptions/OFAcceptFailedException.m
==================================================================
--- src/exceptions/OFAcceptFailedException.m
+++ src/exceptions/OFAcceptFailedException.m
@@ -43,17 +43,12 @@
 - initWithClass: (Class)class_
 	 socket: (OFTCPSocket*)socket_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		socket = [socket_ retain];
-		errNo = GET_SOCK_ERRNO;
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	socket = [socket_ retain];
+	errNo = GET_SOCK_ERRNO;
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFAlreadyConnectedException.m
==================================================================
--- src/exceptions/OFAlreadyConnectedException.m
+++ src/exceptions/OFAlreadyConnectedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 socket: (OFTCPSocket*)socket_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		socket = [socket_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	socket = [socket_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFConditionBroadcastFailedException.m
==================================================================
--- src/exceptions/OFConditionBroadcastFailedException.m
+++ src/exceptions/OFConditionBroadcastFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
       condition: (OFCondition*)condition_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		condition = [condition_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	condition = [condition_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFConditionSignalFailedException.m
==================================================================
--- src/exceptions/OFConditionSignalFailedException.m
+++ src/exceptions/OFConditionSignalFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
       condition: (OFCondition*)condition_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		condition = [condition_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	condition = [condition_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFConditionStillWaitingException.m
==================================================================
--- src/exceptions/OFConditionStillWaitingException.m
+++ src/exceptions/OFConditionStillWaitingException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
       condition: (OFCondition*)condition_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		condition = [condition_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	condition = [condition_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFConditionWaitFailedException.m
==================================================================
--- src/exceptions/OFConditionWaitFailedException.m
+++ src/exceptions/OFConditionWaitFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
       condition: (OFCondition*)condition_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		condition = [condition_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	condition = [condition_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFEnumerationMutationException.m
==================================================================
--- src/exceptions/OFEnumerationMutationException.m
+++ src/exceptions/OFEnumerationMutationException.m
@@ -40,16 +40,11 @@
 - initWithClass: (Class)class_
 	 object: (id)object_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		object = [object_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	object = [object_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFHTTPRequestFailedException.m
==================================================================
--- src/exceptions/OFHTTPRequestFailedException.m
+++ src/exceptions/OFHTTPRequestFailedException.m
@@ -45,17 +45,12 @@
     HTTPRequest: (OFHTTPRequest*)request
 	 result: (OFHTTPRequestResult*)result_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		HTTPRequest = [request retain];
-		result = [result_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	HTTPRequest = [request retain];
+	result = [result_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFHashAlreadyCalculatedException.m
==================================================================
--- src/exceptions/OFHashAlreadyCalculatedException.m
+++ src/exceptions/OFHashAlreadyCalculatedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	   hash: (OFHash*)hash
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		hashObject = [hash retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	hashObject = [hash retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFListenFailedException.m
==================================================================
--- src/exceptions/OFListenFailedException.m
+++ src/exceptions/OFListenFailedException.m
@@ -46,18 +46,13 @@
 	 socket: (OFTCPSocket*)socket_
 	backLog: (int)backlog
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		socket = [socket_ retain];
-		backLog = backlog;
-		errNo = GET_SOCK_ERRNO;
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	socket = [socket_ retain];
+	backLog = backlog;
+	errNo = GET_SOCK_ERRNO;
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFMalformedXMLException.m
==================================================================
--- src/exceptions/OFMalformedXMLException.m
+++ src/exceptions/OFMalformedXMLException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 parser: (OFXMLParser*)parser_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		parser = [parser_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	parser = [parser_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFMutexLockFailedException.m
==================================================================
--- src/exceptions/OFMutexLockFailedException.m
+++ src/exceptions/OFMutexLockFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	  mutex: (OFMutex*)mutex_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		mutex = [mutex_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	mutex = [mutex_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFMutexStillLockedException.m
==================================================================
--- src/exceptions/OFMutexStillLockedException.m
+++ src/exceptions/OFMutexStillLockedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	  mutex: (OFMutex*)mutex_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		mutex = [mutex_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	mutex = [mutex_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFMutexUnlockFailedException.m
==================================================================
--- src/exceptions/OFMutexUnlockFailedException.m
+++ src/exceptions/OFMutexUnlockFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	  mutex: (OFMutex*)mutex_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		mutex = [mutex_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	mutex = [mutex_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFNotConnectedException.m
==================================================================
--- src/exceptions/OFNotConnectedException.m
+++ src/exceptions/OFNotConnectedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 socket: (OFStreamSocket*)socket_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		socket = [socket_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	socket = [socket_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFReadOrWriteFailedException.m
==================================================================
--- src/exceptions/OFReadOrWriteFailedException.m
+++ src/exceptions/OFReadOrWriteFailedException.m
@@ -46,21 +46,17 @@
 	   stream: (OFStream*)stream_
   requestedLength: (size_t)length
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		stream = [stream_ retain];
-		requestedLength = length;
-
-		if ([class_ isSubclassOfClass: [OFStreamSocket class]])
-			errNo = GET_SOCK_ERRNO;
-		else
-			errNo = GET_ERRNO;
-	} @catch (id e) {
-		return e;
-	}
+	stream = [stream_ retain];
+	requestedLength = length;
+
+	if ([class_ isSubclassOfClass: [OFStreamSocket class]])
+		errNo = GET_SOCK_ERRNO;
+	else
+		errNo = GET_ERRNO;
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFSeekFailedException.m
==================================================================
--- src/exceptions/OFSeekFailedException.m
+++ src/exceptions/OFSeekFailedException.m
@@ -49,19 +49,14 @@
 	 offset: (off_t)offset_
 	 whence: (int)whence_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		stream = [stream_ retain];
-		offset = offset_;
-		whence = whence_;
-		errNo = GET_ERRNO;
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	stream = [stream_ retain];
+	offset = offset_;
+	whence = whence_;
+	errNo = GET_ERRNO;
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFSetOptionFailedException.m
==================================================================
--- src/exceptions/OFSetOptionFailedException.m
+++ src/exceptions/OFSetOptionFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 stream: (OFStream*)stream_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		stream = [stream_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	stream = [stream_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFSymlinkFailedException.m
==================================================================
--- src/exceptions/OFSymlinkFailedException.m
+++ src/exceptions/OFSymlinkFailedException.m
@@ -46,13 +46,18 @@
        sourcePath: (OFString*)src
   destinationPath: (OFString*)dest
 {
 	self = [super initWithClass: class_];
 
-	sourcePath = [src copy];
-	destinationPath = [dest copy];
-	errNo = GET_ERRNO;
+	@try {
+		sourcePath = [src copy];
+		destinationPath = [dest copy];
+		errNo = GET_ERRNO;
+	} @catch (id e) {
+		[self release];
+		@throw e;
+	}
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFThreadJoinFailedException.m
==================================================================
--- src/exceptions/OFThreadJoinFailedException.m
+++ src/exceptions/OFThreadJoinFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 thread: (OFThread*)thread_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		thread = [thread_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	thread = [thread_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFThreadStartFailedException.m
==================================================================
--- src/exceptions/OFThreadStartFailedException.m
+++ src/exceptions/OFThreadStartFailedException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 thread: (OFThread*)thread_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		thread = [thread_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	thread = [thread_ retain];
 
 	return self;
 }
 
 - (void)dealloc

Index: src/exceptions/OFThreadStillRunningException.m
==================================================================
--- src/exceptions/OFThreadStillRunningException.m
+++ src/exceptions/OFThreadStillRunningException.m
@@ -41,16 +41,11 @@
 - initWithClass: (Class)class_
 	 thread: (OFThread*)thread_
 {
 	self = [super initWithClass: class_];
 
-	@try {
-		thread = [thread_ retain];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
+	thread = [thread_ retain];
 
 	return self;
 }
 
 - (void)dealloc