diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index 58d20d212b..b8aef2c8db 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -85,7 +85,9 @@ public class MatrixConfiguration extends Project public FilePath getWorkspace() { Node node = getLastBuiltOn(); if(node==null) node = Hudson.getInstance(); - return node.getWorkspaceFor(getParent()).child(getCombination().toString('/','/')); + FilePath ws = node.getWorkspaceFor(getParent()); + if(ws==null) return null; + return ws.child(getCombination().toString('/','/')); } @Override