diff --git a/src/las.c b/src/las.c
index f8199bd4d36d1e955159f2aad09e69ac15e88cb6..aa7737e999f7067c5db45d21ee6d85d8a34f9123 100644
--- a/src/las.c
+++ b/src/las.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: las.c,v 1.63 1998/06/06 03:27:25 hubbe Exp $");
+RCSID("$Id: las.c,v 1.64 1998/07/19 22:50:44 grubba Exp $");
 
 #include "language.h"
 #include "interpret.h"
@@ -609,18 +609,22 @@ void resolv_constant(node *n)
       break;
 
     case F_LOCAL:
+      /* FIXME: Ought to have the name of the identifier in the message. */
       yyerror("Expected constant, got local variable");
       push_int(0);
       return;
 
     case F_GLOBAL:
+      /* FIXME: Ought to have the name of the identifier in the message. */
       yyerror("Expected constant, got global variable");
       push_int(0);
       return;
 
     case F_UNDEFINED:
-      if(compiler_pass==2)
+      if(compiler_pass==2) {
+	/* FIXME: Ought to have the name of the identifier in the message. */
 	yyerror("Expected constant, got undefined identifier");
+      }
       push_int(0);
       return;
 
@@ -637,7 +641,7 @@ void resolv_constant(node *n)
       push_svalue(PROG_FROM_INT(p, numid)->constants +
 		  i->func.offset);
     }else{
-      yyerror("Identifier is not a constant");
+      my_yyerror("Identifier '%s' is not a constant", i->name->str);
       push_int(0);
     }
   }