Index: src/OFExceptions.m
==================================================================
--- src/OFExceptions.m
+++ src/OFExceptions.m
@@ -14,10 +14,21 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#import <objc/objc-api.h>
+#ifdef __objc_INCLUDE_GNU
+#define SEL_NAME(x) sel_get_name(x)
+#else
+#import <objc/runtime.h>
+#define SEL_NAME(x) sel_getName(x)
+#endif
+
+#import "OFExceptions.h"
+#import "OFTCPSocket.h"
+
 #ifndef _WIN32
 #include <errno.h>
 #define GET_ERR	     errno
 #define GET_SOCK_ERR errno
 #define ERRFMT	     "Error string was: %s"
@@ -28,20 +39,10 @@
 #define GET_SOCK_ERR WSAGetLastError()
 #define ERRFMT	     "Error code was: %d"
 #define ERRPARAM     err
 #endif
 
-#import <objc/objc-api.h>
-#ifdef __objc_INCLUDE_GNU
-#define SEL_NAME(x) sel_get_name(x)
-#else
-#import <objc/runtime.h>
-#define SEL_NAME(x) sel_getName(x)
-#endif
-
-#import "OFExceptions.h"
-
 #ifndef HAVE_ASPRINTF
 #import "asprintf.h"
 #endif
 
 @implementation OFAllocFailedException
@@ -356,11 +357,15 @@
 	self = [super initWithClass: class_];
 
 	req_size = size;
 	req_items = nitems;
 	has_items = YES;
-	err = GET_ERR;
+
+	if (class_ == [OFTCPSocket class])
+		err = GET_SOCK_ERR;
+	else
+		err = GET_ERR;
 
 	return self;
 }
 
 - initWithClass: (Class)class_
@@ -369,11 +374,15 @@
 	self = [super initWithClass: class_];
 
 	req_size = size;
 	req_items = 0;
 	has_items = NO;
-	err = GET_ERR;
+
+	if (class_ == [OFTCPSocket class])
+		err = GET_SOCK_ERR;
+	else
+		err = GET_ERR;
 
 	return self;
 }
 
 - (int)errNo