@@ -435,11 +435,14 @@
 			c = (uintptr_t)read_value(lsda->typestable_enc, &tmp);
 			c = (uintptr_t)resolve_value(c, lsda->typestable_enc,
 			    lsda->typestable - i, lsda->typestable_base);
 #endif
 
-			class = (c != 0 ? objc_get_class((const char*)c) : Nil);
+			if (c != 0)
+				class = objc_getRequiredClass((const char*)c);
+			else
+				class = Nil;
 
 			if (class_matches(class, e->object)) {
 				*filtervalue = filter;
 				return HANDLER_FOUND;
 			}