@@ -35,11 +35,11 @@
 #ifdef OF_HAVE_THREADS
 OF_CONSTRUCTOR()
 {
 	for (size_t i = 0; i < numSpinlocks; i++)
 		if (OFSpinlockNew(&spinlocks[i]) != 0)
-			OBJC_ERROR("Failed to initialize spinlocks!");
+			OBJC_ERROR("Failed to create spinlocks!");
 }
 #endif
 
 id
 objc_getProperty(id self, SEL _cmd, ptrdiff_t offset, bool atomic)
@@ -47,15 +47,17 @@
 	if (atomic) {
 		id *ptr = (id *)(void *)((char *)self + offset);
 #ifdef OF_HAVE_THREADS
 		size_t slot = spinlockSlot(ptr);
 
-		OFEnsure(OFSpinlockLock(&spinlocks[slot]) == 0);
+		if (OFSpinlockLock(&spinlocks[slot]) != 0)
+			OBJC_ERROR("Failed to lock spinlock!");
 		@try {
 			return [[*ptr retain] autorelease];
 		} @finally {
-			OFEnsure(OFSpinlockUnlock(&spinlocks[slot]) == 0);
+			if (OFSpinlockUnlock(&spinlocks[slot]) != 0)
+				OBJC_ERROR("Failed to unlock spinlock!");
 		}
 #else
 		return [[*ptr retain] autorelease];
 #endif
 	}
@@ -70,11 +72,12 @@
 	if (atomic) {
 		id *ptr = (id *)(void *)((char *)self + offset);
 #ifdef OF_HAVE_THREADS
 		size_t slot = spinlockSlot(ptr);
 
-		OFEnsure(OFSpinlockLock(&spinlocks[slot]) == 0);
+		if (OFSpinlockLock(&spinlocks[slot]) != 0)
+			OBJC_ERROR("Failed to lock spinlock!");
 		@try {
 #endif
 			id old = *ptr;
 
 			switch (copy) {
@@ -89,11 +92,12 @@
 			}
 
 			[old release];
 #ifdef OF_HAVE_THREADS
 		} @finally {
-			OFEnsure(OFSpinlockUnlock(&spinlocks[slot]) == 0);
+			if (OFSpinlockUnlock(&spinlocks[slot]) != 0)
+				OBJC_ERROR("Failed to unlock spinlock!");
 		}
 #endif
 
 		return;
 	}
@@ -122,15 +126,17 @@
 {
 	if (atomic) {
 #ifdef OF_HAVE_THREADS
 		size_t slot = spinlockSlot(src);
 
-		OFEnsure(OFSpinlockLock(&spinlocks[slot]) == 0);
+		if (OFSpinlockLock(&spinlocks[slot]) != 0)
+			OBJC_ERROR("Failed to lock spinlock!");
 #endif
 		memcpy(dest, src, size);
 #ifdef OF_HAVE_THREADS
-		OFEnsure(OFSpinlockUnlock(&spinlocks[slot]) == 0);
+		if (OFSpinlockUnlock(&spinlocks[slot]) != 0)
+			OBJC_ERROR("Failed to unlock spinlock!");
 #endif
 
 		return;
 	}
 
@@ -143,15 +149,17 @@
 {
 	if (atomic) {
 #ifdef OF_HAVE_THREADS
 		size_t slot = spinlockSlot(src);
 
-		OFEnsure(OFSpinlockLock(&spinlocks[slot]) == 0);
+		if (OFSpinlockLock(&spinlocks[slot]) != 0)
+			OBJC_ERROR("Failed to lock spinlock!");
 #endif
 		memcpy(dest, src, size);
 #ifdef OF_HAVE_THREADS
-		OFEnsure(OFSpinlockUnlock(&spinlocks[slot]) == 0);
+		if (OFSpinlockUnlock(&spinlocks[slot]) != 0)
+			OBJC_ERROR("Failed to unlock spinlock!");
 #endif
 
 		return;
 	}
 
@@ -194,11 +202,14 @@
 
 	i = 0;
 	for (iter = class->propertyList; iter != NULL; iter = iter->next)
 		for (unsigned int j = 0; j < iter->count; j++)
 			properties[i++] = &iter->properties[j];
-	OFEnsure(i == count);
+
+	if (i != count)
+		OBJC_ERROR("Fatal internal inconsistency!");
+
 	properties[count] = NULL;
 
 	if (outCount != NULL)
 		*outCount = count;
 
@@ -256,9 +267,9 @@
 #undef BOOL_CASE
 	}
 
 	if (nullIsError && ret == NULL)
 		OBJC_ERROR("Not enough memory to copy property attribute "
-		    "value");
+		    "value!");
 
 	return ret;
 }