@@ -198,11 +198,12 @@
 #ifdef OF_HAVE_THREADS
 	if (!of_spinlock_lock(&spinlock))
 		OBJC_ERROR("Failed to lock spinlock!")
 #endif
 
-	if ((ref = objc_hashtable_get(hashtable, *object)) != NULL)
+	if (*object != nil &&
+	    (ref = objc_hashtable_get(hashtable, *object)) != NULL)
 		value = *object;
 
 #ifdef OF_HAVE_THREADS
 	if (!of_spinlock_unlock(&spinlock))
 		OBJC_ERROR("Failed to unlock spinlock!")
@@ -248,11 +249,12 @@
 #ifdef OF_HAVE_THREADS
 	if (!of_spinlock_lock(&spinlock))
 		OBJC_ERROR("Failed to lock spinlock!")
 #endif
 
-	if ((ref = objc_hashtable_get(hashtable, *src)) != NULL) {
+	if (*src != nil &&
+	    (ref = objc_hashtable_get(hashtable, *src)) != NULL) {
 		for (size_t i = 0; i < ref->count; i++) {
 			if (ref->locations[i] == src) {
 				ref->locations[i] = dest;
 				break;
 			}