diff --git a/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/HudsonServerBehaviour.java b/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/HudsonServerBehaviour.java
index 0ea1c6f..b9af46b 100644
--- a/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/HudsonServerBehaviour.java
+++ b/org.eclipse.mylyn.hudson.core/src/org/eclipse/mylyn/internal/hudson/core/HudsonServerBehaviour.java
@@ -306,7 +306,10 @@
 			build.getArtifacts().add(artifact);
 		}
 		if (hudsonBuild instanceof HudsonModelAbstractBuild) {
-			build.setChangeSet(parseChangeSet(((HudsonModelAbstractBuild) hudsonBuild).getChangeSet()));
+			HudsonScmChangeLogSet changeSet = ((HudsonModelAbstractBuild) hudsonBuild).getChangeSet();
+			if (changeSet != null) {
+				build.setChangeSet(parseChangeSet(changeSet));
+			}
 		}
 		return build;
 	}