diff --git a/OpenRA.Mods.Cnc/Graphics/Voxel.cs b/OpenRA.Mods.Cnc/Graphics/Voxel.cs
index e1c29ff4ca..6c45f4c0f1 100644
--- a/OpenRA.Mods.Cnc/Graphics/Voxel.cs
+++ b/OpenRA.Mods.Cnc/Graphics/Voxel.cs
@@ -35,10 +35,10 @@ namespace OpenRA.Mods.Cnc.Graphics
 		uint IModel.Frames { get { return frames; } }
 		uint IModel.Sections { get { return limbs; } }
 
-		public Voxel(VoxelLoader loader, VxlReader vxl, HvaReader hva)
+		public Voxel(VoxelLoader loader, VxlReader vxl, HvaReader hva, (string Vxl, string Hva) files)
 		{
 			if (vxl.LimbCount != hva.LimbCount)
-				throw new InvalidOperationException("Voxel and hva limb counts don't match");
+				throw new InvalidOperationException("{0}.vxl and {1}.hva limb counts don't match.".F(files.Vxl, files.Hva));
 
 			transforms = hva.Transforms;
 			frames = hva.FrameCount;
diff --git a/OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs b/OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
index a04f5ee0e0..dd194a33b3 100644
--- a/OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
+++ b/OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
@@ -216,9 +216,10 @@ namespace OpenRA.Mods.Cnc.Graphics
 			HvaReader hva;
 			using (var s = fileSystem.Open(files.Vxl + ".vxl"))
 				vxl = new VxlReader(s);
+
 			using (var s = fileSystem.Open(files.Hva + ".hva"))
 				hva = new HvaReader(s, files.Hva + ".hva");
-			return new Voxel(this, vxl, hva);
+			return new Voxel(this, vxl, hva, files);
 		}
 
 		public Voxel Load(string vxl, string hva)