diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp
index e8979da0c17..517fddb2acd 100644
--- a/src/compiler/glsl/ir.cpp
+++ b/src/compiler/glsl/ir.cpp
@@ -2212,7 +2212,7 @@ ir_function::has_user_signature()
 ir_rvalue *
 ir_rvalue::error_value(void *mem_ctx)
 {
-   ir_rvalue *v = new(mem_ctx) ir_rvalue(ir_type_unset);
+   ir_rvalue *v = new(mem_ctx) ir_rvalue(ir_type_error);
 
    v->type = &glsl_type_builtin_error;
    return v;
diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index b288ba34618..89a9df62c2a 100644
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -94,7 +94,8 @@ enum ir_node_type {
    ir_type_end_primitive,
    ir_type_barrier,
    ir_type_max, /**< maximum ir_type enum number, for validation */
-   ir_type_unset = ir_type_max
+   ir_type_unset = ir_type_max,
+   ir_type_error
 };
 
 
@@ -132,7 +133,8 @@ public:
              ir_type == ir_type_constant ||
              ir_type == ir_type_expression ||
              ir_type == ir_type_swizzle ||
-             ir_type == ir_type_texture;
+             ir_type == ir_type_texture ||
+             ir_type == ir_type_error;
    }
 
    bool is_dereference() const