diff --git a/Source/ViewModels/AchievementViewModel.cs b/Source/ViewModels/AchievementViewModel.cs
index efc94ba9..27aa4b1b 100644
--- a/Source/ViewModels/AchievementViewModel.cs
+++ b/Source/ViewModels/AchievementViewModel.cs
@@ -112,8 +112,11 @@ protected override void UpdateLocal(AssetBase asset, AssetBase localAsset, Strin
             var localAchievement = (Achievement)localAsset;
             var achievement = (Achievement)asset;
 
-            if (String.IsNullOrEmpty(achievement.BadgeName) || achievement.BadgeName == "0")
-                achievement.BadgeName = BadgeName;
+            if (achievement != null)
+            {
+                if (String.IsNullOrEmpty(achievement.BadgeName) || achievement.BadgeName == "0")
+                    achievement.BadgeName = BadgeName;
+            }
 
             _owner.UpdateLocal(achievement, localAchievement, warning, validateAll);
         }