diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
index 74600902264..4e16817ae5b 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
@@ -180,7 +180,13 @@ public class CValue extends CDebugElement implements ICValue
 			ICDIValue value = getUnderlyingValue();
 			if ( value != null )
 			{
-				return Arrays.asList( value.getVariables() );
+				ICDIVariable[] vars = value.getVariables();
+				//Should throw an exception
+				if ( vars == null )
+				{
+					vars = new ICDIVariable[0];
+				}
+				return Arrays.asList( vars );
 			}
 		}
 		catch( CDIException e )