diff -urN bison-2.5/src/location.c bison-2.5-haiku/src/location.c
--- bison-2.5/src/location.c	2011-05-01 22:17:32.046137344 +0000
+++ bison-2.5-haiku/src/location.c	2012-06-01 18:19:15.538443776 +0000
@@ -144,11 +144,11 @@
   /* Must search in reverse since the file name field may
    * contain `.' or `:'.  */
   char *delim = mbsrchr (loc_str, '.');
-  aver (delim);
+  aver (delim != NULL);
   *delim = '\0';
   bound->column = atoi (delim+1);
   delim = mbsrchr (loc_str, ':');
-  aver (delim);
+  aver (delim != NULL);
   *delim = '\0';
   bound->line = atoi (delim+1);
   bound->file = uniqstr_new (loc_str);
diff -urN bison-2.5/src/muscle-tab.c bison-2.5-haiku/src/muscle-tab.c
--- bison-2.5/src/muscle-tab.c	2011-05-14 22:17:12.043253760 +0000
+++ bison-2.5-haiku/src/muscle-tab.c	2012-06-01 18:16:05.827326464 +0000
@@ -336,7 +336,7 @@
 {
   location loc;
   char const *value = muscle_find_const (key);
-  aver (value);
+  aver (value != NULL);
   aver (*value == '[');
   aver (*++value == '[');
   while (*++value)
