diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 54018ab712..090c02d8f5 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -1333,7 +1333,7 @@ def CompileAnything(target, inputs, opts, progress = None):
         elif (infile.endswith(".rc") or infile.endswith(".r")):
             ProgressOutput(progress, "Building resource object", target)
             return CompileResource(target, infile, opts)
-    exit("Don't know how to compile: "+target)
+    exit("Don't know how to compile: %s from %s" % (target, inputs))
 
 ##########################################################################################
 #
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index bd869df4c7..a84f1d3334 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -1921,6 +1921,8 @@ def CalcLocation(fn, ipath):
     if (fn.endswith(".yxx")): return CxxFindSource(fn, ipath)
     if (fn.endswith(".lxx")): return CxxFindSource(fn, ipath)
     if (fn.endswith(".pdef")):return CxxFindSource(fn, ipath)
+    if (fn.endswith(".egg")): return OUTPUTDIR+"/models/"+fn
+    if (fn.endswith(".egg.pz")):return OUTPUTDIR+"/models/"+fn
     if (sys.platform.startswith("win")):
         if (fn.endswith(".def")):   return CxxFindSource(fn, ipath)
         if (fn.endswith(".rc")):    return CxxFindSource(fn, ipath)