From 71805de4aa52ea2de185225a81230c0f254a9473 Mon Sep 17 00:00:00 2001
From: deathride58 <wyattbogle1@gmail.com>
Date: Mon, 4 Sep 2017 03:53:01 -0400
Subject: [PATCH] extra failsafe

---
 code/citadel/cit_crewobjectives.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm
index 70994f1e64..29d7ae950f 100644
--- a/code/citadel/cit_crewobjectives.dm
+++ b/code/citadel/cit_crewobjectives.dm
@@ -20,9 +20,10 @@
 	var/list/objectiveTypes = typesof(rolePath) - rolePath
 	if(!objectiveTypes.len)
 		return
-	
 	var/selectedType = pick(objectiveTypes)
 	var/datum/objective/crew/newObjective = new selectedType
+	if(!newObjective)
+		return
 	newObjective.owner = crewMind
 	crewMind.objectives += newObjective
 	crewMind.announce_objectives()