--- a/OrthancServer/Scheduler/ModifyInstanceCommand.cpp	Tue Aug 05 16:18:45 2014 +0200
+++ b/OrthancServer/Scheduler/ModifyInstanceCommand.cpp	Thu Aug 07 10:02:22 2014 +0200
@@ -44,24 +44,32 @@
     {
       LOG(INFO) << "Modifying resource " << *it;
 
-      std::auto_ptr<ParsedDicomFile> modified;
-
+      try
       {
-        ServerContext::DicomCacheLocker lock(context_, *it);
-        modified.reset(lock.GetDicom().Clone());
-      }
+        std::auto_ptr<ParsedDicomFile> modified;
 
-      modification_.Apply(*modified);
+        {
+          ServerContext::DicomCacheLocker lock(context_, *it);
+          modified.reset(lock.GetDicom().Clone());
+        }
+
+        modification_.Apply(*modified);
 
-      DicomInstanceToStore toStore;
-      toStore.SetParsedDicomFile(*modified);
-      // TODO other metadata
-      toStore.AddMetadata(ResourceType_Instance, MetadataType_ModifiedFrom, *it);
+        DicomInstanceToStore toStore;
+        toStore.SetParsedDicomFile(*modified);
+        // TODO other metadata
+        toStore.AddMetadata(ResourceType_Instance, MetadataType_ModifiedFrom, *it);
+
+        std::string modifiedId;
+        context_.Store(modifiedId, toStore);
 
-      std::string modifiedId;
-      context_.Store(modifiedId, toStore);
-
-      outputs.push_back(modifiedId);
+        // Only chain with other commands if this command succeeds
+        outputs.push_back(modifiedId);
+      }
+      catch (OrthancException& e)
+      {
+        LOG(ERROR) << "Unable to modify instance " << *it << " in a Lua script: " << e.What();
+      }
     }
 
     return true;