Merge with master

1 files changed, 3 insertions, 2 deletions

diff --git a/config-lib/src/main/java/com/yahoo/config/FileReference.java b/config-lib/src/main/java/com/yahoo/config/FileReference.java
index 5f0bc275bad..7d455c58b30 100755
--- a/config-lib/src/main/java/com/yahoo/config/FileReference.java
+++ b/config-lib/src/main/java/com/yahoo/config/FileReference.java
@@ -7,19 +7,20 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * An immutable file reference that can only be created from classes within the same package.
  * This is to prevent clients from creating arbitrary and invalid file references.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public final class FileReference {
 
     private final String value;
 
     public FileReference(String value) {
-        this.value = value;
+        this.value = Objects.requireNonNull(value);
     }
 
     public String value() {