diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index 00aa79b9b1..53f5d6bedc 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -296,6 +296,9 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep {
          * Performs on-the-fly validation on the file mask wildcard.
          */
         public FormValidation doCheckArtifacts(@AncestorInPath AbstractProject project, @QueryParameter String value) throws IOException {
+            if (project == null) {
+                return FormValidation.ok();
+            }
             return FilePath.validateFileMask(project.getSomeWorkspace(),value);
         }
 
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 7320838ec4..8c00b145b9 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -260,6 +260,9 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
         }
 
         public FormValidation doCheckTargets(@AncestorInPath AbstractProject<?,?> project, @QueryParameter String value) throws IOException {
+            if (project == null) {
+                return FormValidation.ok();
+            }
             return FilePath.validateFileMask(project.getSomeWorkspace(),value);
         }