diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java
index ee9eae105e3..9ec31b2e863 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java
@@ -60,8 +60,9 @@ public class DestroyedEvent implements ICDIDestroyedEvent {
 		session = s;
 		SharedLibraryManager mgr = (SharedLibraryManager)session.getSharedLibraryManager();
 		String name = slib.getName();
-		ICDISharedLibrary lib = mgr.getSharedLibrary(name);
+		ICDISharedLibrary lib = mgr.getUnloadedLibrary(name);
 		if (lib != null) {
+			mgr.removeFromUnloadedList(name);
 			source = lib;
 		} else {
 			source = new CObject(session.getCTarget());