diff --git a/Main/Source/char.cpp b/Main/Source/char.cpp
index a263c8238..60c12b099 100644
--- a/Main/Source/char.cpp
+++ b/Main/Source/char.cpp
@@ -12099,6 +12099,8 @@ struct trapidcomparer
 void character::RemoveTrap(ulong ID)
 {
   trapdata*& T = ListFind(TrapData, trapidcomparer(ID));
+  if (T == nullptr)
+    return;
   trapdata* ToDel = T;
   T = T->Next;
   delete ToDel;