diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java
index 49ec6caa5cd..c8b9cde92aa 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java
@@ -133,16 +133,21 @@ public class StackFrame extends CObject implements ICDIStackFrame {
 	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLocation()
 	 */
 	public ICDILocation getLocation() {
+		BigInteger addr = BigInteger.ZERO;
 		if (frame != null) {
 			if (fLocation == null) {
+				String a = frame.getAddress();
+				if (a != null) {
+					addr = MIFormat.getBigInteger(a);
+				}
 				fLocation = new Location(frame.getFile(), 
 					            frame.getFunction(),
 					            frame.getLine(),  
-								MIFormat.getBigInteger(frame.getAddress()));
+								addr);
 			}
 			return fLocation;
 		}
-		return new Location("", "", 0, BigInteger.ZERO); //$NON-NLS-1$ //$NON-NLS-2$
+		return new Location("", "", 0, addr); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**