@@ -16,29 +16,25 @@
 
 #import "OFObject.h"
 #import "OFExceptions.h"
 
 #define CATCH_EXCEPTION(code, exception)		\
-	caught = NO;					\
 	@try {						\
 		code;					\
+							\
+		puts("NOT CAUGHT!");			\
+		return 1;				\
 	} @catch (exception *e) {			\
-		caught = YES;				\
 		puts("CAUGHT! Error string was:");	\
 		puts([e cString]);			\
 		puts("Resuming...");			\
-	}						\
-	if (!caught) {					\
-		puts("NOT CAUGHT!");			\
-		return 1;				\
 	}
 
 int
 main()
 {
 	OFObject *obj = [OFObject new];
-	BOOL caught;
 	void *p, *q, *r;
 
 	/* Test freeing memory not allocated by obj */
 	puts("Freeing memory not allocated by object (should throw an "
 	    "exception)...");