diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 89300882d..b99d33385 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -1252,6 +1252,9 @@ encode_type (dstring_t *encoding, const type_t *type)
 int is_##t (const type_t *type) \
 { \
 	type = unalias_type (type); \
+	if (type->meta != ty_basic && type->meta != ty_algebra) { \
+		return 0; \
+	} \
 	return type->type == ev_##t; \
 }
 #include "QF/progs/pr_type_names.h"
@@ -1357,7 +1360,7 @@ int
 is_handle (const type_t *type)
 {
 	type = unalias_type (type);
-	if (type->type == ev_invalid && type->meta == ty_handle)
+	if (type->meta == ty_handle)
 		return 1;
 	return 0;
 }