diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java
index 88c8a119eb1..7f969a79fcc 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java
@@ -513,6 +513,9 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 			                }
 			            });
 			    }
+				else {
+			    	drm.done();
+			    }
 				
 			}
         };
@@ -551,9 +554,11 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 			        // Go for it
 	    	        memoryService.setMemory(
 		    	  	      fContext, address, offset, fWordSize, bytes.length, bytes,
-		    	  	      new RequestMonitor(fRetrieval.getExecutor(), null));
+		    	  	      new RequestMonitor(fRetrieval.getExecutor(), drm));
+			    }
+			    else {
+			    	drm.done();
 			    }
-				
 			}
         };
         fRetrieval.getExecutor().execute(query);