--- a/src/newgrf_config.cpp	Thu Mar 01 13:35:40 2007 +0000
+++ b/src/newgrf_config.cpp	Thu Mar 01 18:28:55 2007 +0000
@@ -255,8 +255,8 @@
 				free(c->filename);
 				c->filename = strdup(f->filename);
 				memcpy(c->md5sum, f->md5sum, sizeof(c->md5sum));
-				if (c->name == NULL) c->name = strdup(f->name);
-				if (c->info == NULL) c->info = strdup(f->info);
+				if (c->name == NULL && f->name != NULL) c->name = strdup(f->name);
+				if (c->info == NULL && f->info != NULL) c->info = strdup(f->info);
 				c->error = NULL;
 			}
 		}