diff --git a/OpenRA.Game/Effects/Bullet.cs b/OpenRA.Game/Effects/Bullet.cs
index 7630934168..7060fd793e 100755
--- a/OpenRA.Game/Effects/Bullet.cs
+++ b/OpenRA.Game/Effects/Bullet.cs
@@ -75,7 +75,7 @@ namespace OpenRA.Effects
 		{
 			t += 40;
 
-			anim.Tick();
+			if (anim != null) anim.Tick();
 
 			if (t > TotalTime()) Explode( world );
 
diff --git a/OpenRA.Game/Graphics/Animation.cs b/OpenRA.Game/Graphics/Animation.cs
index 832a5fc905..da9bb2a120 100644
--- a/OpenRA.Game/Graphics/Animation.cs
+++ b/OpenRA.Game/Graphics/Animation.cs
@@ -68,6 +68,9 @@ namespace OpenRA.Graphics
 
 		public void ReplaceAnim(string sequenceName)
 		{
+			if (!HasSequence(sequenceName))
+				return;
+
 			CurrentSequence = SequenceProvider.GetSequence(name, sequenceName);
 			frame %= CurrentSequence.Length;
 		}
diff --git a/OpenRAUploader/Program.cs b/OpenRAUploader/Program.cs
index 49e7714f1b..7d213abb0f 100644
--- a/OpenRAUploader/Program.cs
+++ b/OpenRAUploader/Program.cs
@@ -38,7 +38,7 @@ namespace OpenRAUploader
 			fileStream.Close();
 
 			var jsonUri = new UriBuilder(uri.Uri);
-			jsonUri.Path += "_version.json";
+			jsonUri.Path += "version.json";
 
 			string formatString = "{{\n" +
 				"\t\"version\":\"{0}\",\n" +