@@ -50,11 +50,11 @@
 		InitSemaphore(&semaphore);
 		semaphoreInitialized = true;
 	}
 }
 
-bool
+int
 of_tlskey_new(of_tlskey_t *key)
 {
 	if (!semaphoreInitialized) {
 		/*
 		 * We might be called from another constructor, while ours has
@@ -64,11 +64,11 @@
 		InitSemaphore(&semaphore);
 		semaphoreInitialized = true;
 	}
 
 	if ((*key = malloc(sizeof(**key))) == NULL)
-		return false;
+		return ENOMEM;
 
 	(*key)->table = NULL;
 
 	ObtainSemaphore(&semaphore);
 	@try {
@@ -85,14 +85,14 @@
 	} @finally {
 		ReleaseSemaphore(&semaphore);
 	}
 
 	/* We create the hash table lazily. */
-	return true;
+	return 0;
 }
 
-bool
+int
 of_tlskey_free(of_tlskey_t key)
 {
 	ObtainSemaphore(&semaphore);
 	@try {
 		if (key->previous != NULL)
@@ -109,11 +109,11 @@
 		free(key);
 	} @finally {
 		ReleaseSemaphore(&semaphore);
 	}
 
-	return true;
+	return 0;
 }
 
 void *
 of_tlskey_get(of_tlskey_t key)
 {
@@ -130,11 +130,11 @@
 	}
 
 	return ret;
 }
 
-bool
+int
 of_tlskey_set(of_tlskey_t key, void *ptr)
 {
 	ObtainSemaphore(&semaphore);
 	@try {
 		struct Task *task = FindTask(NULL);
@@ -144,17 +144,15 @@
 
 		if (ptr == NULL)
 			objc_hashtable_delete(key->table, task);
 		else
 			objc_hashtable_set(key->table, task, ptr);
-	} @catch (id e) {
-		return false;
 	} @finally {
 		ReleaseSemaphore(&semaphore);
 	}
 
-	return true;
+	return 0;
 }
 
 void
 of_tlskey_thread_exited(void)
 {