diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c
index fd5bc9e1..60054bef 100644
--- a/sourcepawn/compiler/sc1.c
+++ b/sourcepawn/compiler/sc1.c
@@ -1350,7 +1350,7 @@ static void setconstants(void)
   pc_tag_void = pc_addtag_flags("void", FIXEDTAG);
   pc_tag_object = pc_addtag_flags("object", FIXEDTAG|OBJECTTAG);
   pc_tag_bool = pc_addtag("bool");
-  pc_tag_null_t = pc_addtag_flags("null", FIXEDTAG|OBJECTTAG);
+  pc_tag_null_t = pc_addtag_flags("null_t", FIXEDTAG|OBJECTTAG);
 
   add_constant("true",1,sGLOBAL,1);     /* boolean flags */
   add_constant("false",0,sGLOBAL,1);
diff --git a/sourcepawn/compiler/sc5.scp b/sourcepawn/compiler/sc5.scp
index c2341156..8ac1517c 100644
--- a/sourcepawn/compiler/sc5.scp
+++ b/sourcepawn/compiler/sc5.scp
@@ -191,6 +191,7 @@ static char *errmsg[] = {
 /*145*/  "invalid type expression\n",
 /*146*/  "#pragma newdecls must be required or optional\n",
 /*147*/  "new-style declarations are required\n",
+/*148*/  "cannot assign null to a non-nullable type\n",
 #else
   "\247\255\311\232\273k\214:\234\306bu\201fo\223\204\222\012",
   "\202l\224\251s\206g\344\352e\233\201(\242\247\323\267\202) \254 f\252low ea\277 \042c\343e\042\012",