--- a/src/newgrf_engine.cpp	Fri Jun 06 19:27:09 2008 +0000
+++ b/src/newgrf_engine.cpp	Sat Jun 07 00:06:36 2008 +0000
@@ -880,7 +880,7 @@
 	NewVehicleResolver(&object, engine, v);
 
 	group = Resolve(GetVehicleSpriteGroup(engine, v), &object);
-	if (group == NULL || group->type != SGT_RESULT) return 0;
+	if (group == NULL || group->type != SGT_RESULT || group->g.result.num_sprites == 0) return 0;
 
 	return group->g.result.sprite + (direction % group->g.result.num_sprites);
 }
@@ -903,7 +903,7 @@
 	const SpriteGroup *group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
 	group = Resolve(group, &object);
 
-	if (group == NULL || group->type != SGT_RESULT) return 0;
+	if (group == NULL || group->type != SGT_RESULT || group->g.result.num_sprites == 0) return 0;
 
 	if (v == NULL) return group->g.result.sprite;