diff --git a/CHANGES.txt b/CHANGES.txt
index c320199..bc2bf93 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -34,6 +34,8 @@
  
 IMPROVEMENTS
 
+PIG-5120: Let tez_local mode run without a jar file (knoguchi)
+
 PIG-3851: Upgrade jline to 2.11 (daijy)
 
 PIG-4963: Add a Bloom join (rohini)
diff --git a/src/org/apache/pig/impl/util/JarManager.java b/src/org/apache/pig/impl/util/JarManager.java
index 077c703..dafc42b 100644
--- a/src/org/apache/pig/impl/util/JarManager.java
+++ b/src/org/apache/pig/impl/util/JarManager.java
@@ -207,7 +207,7 @@
         List<String> defaultJars = new ArrayList<String>();
         for (DefaultPigPackages pkgToSend : DefaultPigPackages.values()) {
             String jar = findContainingJar(pkgToSend.getPkgClass());
-            if (!defaultJars.contains(jar)) {
+            if (jar != null && !defaultJars.contains(jar)) {
                 defaultJars.add(jar);
             }
         }