diff --git a/src/eva2/server/stat/AbstractStatistics.java b/src/eva2/server/stat/AbstractStatistics.java
index 44e78257..40ebda4c 100644
--- a/src/eva2/server/stat/AbstractStatistics.java
+++ b/src/eva2/server/stat/AbstractStatistics.java
@@ -1044,6 +1044,11 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
 		}
 	}
 	
+	public String[] getCurrentFieldHeaders() {
+		StringSelection fSel = m_StatsParams.getFieldSelection();
+		return fSel.getSelected();
+	}
+	
 	/**
 	 * Do some data collection on the population.
 	 *
diff --git a/src/eva2/server/stat/EvAJob.java b/src/eva2/server/stat/EvAJob.java
index 082d9743..b549153f 100644
--- a/src/eva2/server/stat/EvAJob.java
+++ b/src/eva2/server/stat/EvAJob.java
@@ -40,6 +40,7 @@ public class EvAJob implements Serializable, InterfaceStatisticsListener {
 	public EvAJob(InterfaceGOParameters params, InterfaceStatistics sts) {
 		this();
 		this.params = params;
+		if (sts instanceof AbstractStatistics) fieldHeaders=((AbstractStatistics)sts).getCurrentFieldHeaders();
 		sts.addDataListener(this);
 	}	
 	
@@ -235,9 +236,11 @@ public class EvAJob implements Serializable, InterfaceStatisticsListener {
 		StringSelection newSel = (StringSelection) curSelection.clone();
 
 		curSelection.setAllSelectionStates(false);
-		for (String field : fieldHeaders) {
-			curSelection.setSelected(field, true);
-		}
+		if (fieldHeaders!=null) {
+			for (String field : fieldHeaders) {
+				curSelection.setSelected(field, true);
+			}
+		} else System.err.println("Warning, empty field selection in job " + this);
 		return newSel;
 	}
 }
\ No newline at end of file