diff --git a/server/achievements/earned_achievement_handler.coffee b/server/achievements/earned_achievement_handler.coffee
index 808edb396..5afba74c2 100644
--- a/server/achievements/earned_achievement_handler.coffee
+++ b/server/achievements/earned_achievement_handler.coffee
@@ -93,7 +93,11 @@ class EarnedAchievementHandler extends Handler
           )
       else
         EarnedAchievement.createForAchievement(achievement, trigger, null, null, (earnedAchievementDoc) =>
-          @sendCreated(res, earnedAchievementDoc.toObject())
+          if earnedAchievementDoc
+            @sendCreated(res, earnedAchievementDoc.toObject())
+          else
+            console.error "Couldn't create achievement", achievement, trigger
+            @sendNotFoundError res, "Couldn't create achievement"
         )
     )