diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
index edd9793a3d2..15e9078914c 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
@@ -23,6 +23,7 @@ import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame;
 import org.eclipse.cdt.debug.mi.core.MIException;
+import org.eclipse.cdt.debug.mi.core.MIPlugin;
 import org.eclipse.cdt.debug.mi.core.MISession;
 import org.eclipse.cdt.debug.mi.core.cdi.event.ChangedEvent;
 import org.eclipse.cdt.debug.mi.core.cdi.event.CreatedEvent;
@@ -328,7 +329,8 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs
 				srcMgr.update(currentTarget);
 			}
 		} catch (CDIException e) {
-			//System.out.println(e);
+			// Something went wrong => preventing updates to the model, this is serious
+			MIPlugin.log(e);
 		}
 		return true;
 	}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
index 7ea3c654090..f9f6e09c136 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
@@ -687,7 +687,11 @@ public class VariableManager extends Manager {
 				variable.setMIVarCreate(var);						
 				update(target, variable, eventList);
 			} catch (MIException e) {
-				throw new MI2CDIException(e);
+				// Creating failed, variable not in scope => remove
+				// No events to fire as the variable isn't backed by a MIVar
+				getVariablesList(target).remove(variable);
+				variable.setUpdated(false);
+				return;
 			} catch (CDIException e) {
 				throw e;
 			}