diff --git a/dwm.c b/dwm.c
index 9dd501a..852f7ac 100644
--- a/dwm.c
+++ b/dwm.c
@@ -262,8 +262,8 @@ applyrules(Client *c) {
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
 		if((!r->title || strstr(c->name, r->title))
-		&& (!ch.res_class || !r->class || strstr(ch.res_class, r->class))
-		&& (!ch.res_name || !r->instance || strstr(ch.res_name, r->instance)))
+		&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+		&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
 		{
 			c->isfloating = r->isfloating;
 			if(r->tag) {