@@ -25,20 +25,20 @@
 - (void*)getMem: (size_t)size
 {
 	struct __ofobject_allocated_mem *iter;
 
 	if ((iter = malloc(sizeof(struct __ofobject_allocated_mem))) == NULL) {
-		@throw [OFNoMemException new: self
-				    withSize: sizeof(
-					      struct __ofobject_allocated_mem)];
+		[OFNoMemException newWithObject: self
+					andSize: sizeof(struct
+						     __ofobject_allocated_mem)];
 		return NULL;
 	}
 
 	if ((iter->ptr = malloc(size)) == NULL) {
 		free(iter);
-		@throw [OFNoMemException new: self
-				    withSize: size];
+		[OFNoMemException newWithObject: self
+					andSize: size];
 		return NULL;
 	}
 
 	iter->next = NULL;
 	iter->prev = __mem_pool;
@@ -57,22 +57,22 @@
 	struct __ofobject_allocated_mem *iter;
 
 	for (iter = __mem_pool; iter != NULL; iter = iter->prev) {
 		if (iter->ptr == ptr) {
 			if ((ptr = realloc(iter->ptr, size)) == NULL) {
-				@throw [OFNoMemException new: self
-						    withSize: size];
+				[OFNoMemException newWithObject: self
+							andSize: size];
 				return NULL;
 			}
 			
 			iter->ptr = ptr;
 			return ptr;
 		}
 	}
 
-	@throw [OFMemNotPartOfObjException new: self
-				       withPtr: ptr];
+	[OFMemNotPartOfObjException newWithObject: self
+				       andPointer: ptr];
 	return NULL;
 }
 
 - (void)freeMem: (void*)ptr;
 {
@@ -92,12 +92,12 @@
 
 			return;
 		}
 	}
 
-	@throw [OFMemNotPartOfObjException new: self
-				       withPtr: ptr];
+	[OFMemNotPartOfObjException newWithObject: self
+				       andPointer: ptr];
 }
 
 - free
 {
 	struct __ofobject_allocated_mem *iter, *iter2;