diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_jediState.py b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_jediState.py
index 754e9d6da62556d564a5a1b49e1168f0dbaeee5d..b9d0541f1dd14e8959486731ab947468f2575c14 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_jediState.py
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_jediState.py
@@ -3,11 +3,12 @@
 
 def ELG_jediState(sample) :
 
-    from pandatools import PandaToolsPkgInfo
-    if int(float(PandaToolsPkgInfo.release_version[2])) < 4 :
-        print "Need prun with JEDI support, try:"
-        print "    localSetupPandaClient currentJedi --noAthenaCheck"
-        return ''
+    try:
+        from pandatools import PandaToolsPkgInfo
+    except:
+        print "prun needs additional setup, try:"
+        print "    lsetup panda"
+        return 99
 
     jediTaskID = int(sample.getMetaDouble("nc_jediTaskID", 0))
 
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
index bc5673cef7dd3e21b32f79f53b594ec8fdf2e29d..3566dcbd8be2b1ef4f7d37a397cacef6d85df1e2 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
@@ -8,10 +8,11 @@ import shlex
 
 def ELG_prun(sample) :
 
-    from pandatools import PandaToolsPkgInfo
-    if int(float(PandaToolsPkgInfo.release_version[2])) < 4 :
-        print "Need prun with JEDI support, try:"
-        print "    localSetupPandaClient currentJedi --noAthenaCheck"
+    try:
+        from pandatools import PandaToolsPkgInfo
+    except:
+        print "prun needs additional setup, try:"
+        print "    lsetup panda"
         return 99
 
     cmd = ["prun"]