diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 6b3e47054c..c42dfc38e2 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -114,6 +114,9 @@ SUBSYSTEM_DEF(persistence)
 	var/saved_json
 	trophy_sav >> saved_json
 
+	if(!saved_json)
+		return
+
 	var/decoded_json = json_decode(saved_json)
 
 	if(!islist(decoded_json))
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 768a5ac217..cffd58482e 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -82,7 +82,7 @@
 		getFlatIcon(A,defdir=4)
 	catch
 		return 0
-	return 1
+	return TRUE
 
 /obj/structure/displaycase/proc/get_flat_icon_directional(atom/A)
 	//Get flatIcon even if dir is mismatched for directionless icons