diff --git a/ion/src/shared/storage.cpp b/ion/src/shared/storage.cpp
index 5e3365f3b..55c99c1a7 100644
--- a/ion/src/shared/storage.cpp
+++ b/ion/src/shared/storage.cpp
@@ -271,6 +271,9 @@ Storage::Record::ErrorStatus Storage::setValueOfRecord(Record record, Record::Da
 }
 
 void Storage::destroyRecord(Record record) {
+  if (record.isNull()) {
+    return;
+  }
   for (char * p : *this) {
     Record currentRecord(fullNameOfRecordStarting(p));
     if (record == currentRecord) {