diff --git a/arangod/VocBase/LogicalCollection.cpp b/arangod/VocBase/LogicalCollection.cpp
index 4e0e015357..7d700fb963 100644
--- a/arangod/VocBase/LogicalCollection.cpp
+++ b/arangod/VocBase/LogicalCollection.cpp
@@ -594,8 +594,10 @@ int LogicalCollection::close() {
     _collection->_info.updateCount(idxSize);
   }
 
-  // We also have to throw away the indexes.
-  _indexes.clear();
+  // We also have to unload the indexes.
+  for (auto& idx : _indexes) {
+    idx->unload();
+  }
 
   _numberDocuments = 0;
 
diff --git a/arangod/VocBase/vocbase.cpp b/arangod/VocBase/vocbase.cpp
index ccc71ebb5a..a5e020bf40 100644
--- a/arangod/VocBase/vocbase.cpp
+++ b/arangod/VocBase/vocbase.cpp
@@ -329,7 +329,6 @@ arangodb::LogicalCollection* TRI_vocbase_t::createCollectionWorker(
     // if an exception is caught, collection will be a nullptr
   }
 
-#warning
   // FIXME
   if (collection == nullptr) {
     delete document;