diff --git a/salt/client.py b/salt/client.py
index 83f908bf94..c3f7397a63 100644
--- a/salt/client.py
+++ b/salt/client.py
@@ -435,6 +435,9 @@ class LocalClient(object):
         gstart = int(time.time())
         ret = {}
         wtag = os.path.join(jid_dir, 'wtag*')
+        # If jid == 0, there is no payload
+        if int(jid) == 0:
+            return ret
         # Check to see if the jid is real, if not return the empty dict
         if not os.path.isdir(jid_dir):
             return ret
diff --git a/salt/config.py b/salt/config.py
index 7bb122a853..f64815ab8c 100644
--- a/salt/config.py
+++ b/salt/config.py
@@ -175,7 +175,8 @@ def minion_config(path):
     opts['grains'] = salt.loader.grains(opts)
 
     # Prepend root_dir to other paths
-    prepend_root_dir(opts, ['pki_dir', 'cachedir', 'log_file', 'key_logfile'])
+    prepend_root_dir(opts, ['pki_dir', 'cachedir', 'log_file',
+                            'key_logfile', 'extension_modules'])
     return opts