diff --git a/planet/reconstitute.py b/planet/reconstitute.py
index 9b99efd..b8b090d 100644
--- a/planet/reconstitute.py
+++ b/planet/reconstitute.py
@@ -86,10 +86,11 @@ def links(xentry, entry):
     if not entry.has_key('links'): return
     xdoc = xentry.ownerDocument
     for link in entry.links:
+        if not 'href' in link.keys(): continue
         xlink = xdoc.createElement('link')
-        xlink.setAttribute('type', link.type)
+        xlink.setAttribute('type', link.get('type',None))
         xlink.setAttribute('href', link.href)
-        xlink.setAttribute('rel', link.rel)
+        xlink.setAttribute('rel', link.get('rel',None))
         xentry.appendChild(xlink)
 
 def date(xentry, name, parsed):
diff --git a/spider.py b/spider.py
index c1c6759..39b73ee 100644
--- a/spider.py
+++ b/spider.py
@@ -10,7 +10,7 @@ if __name__ == '__main__':
     if len(sys.argv) == 2:
         # spider all feeds 
         spider.spiderPlanet(sys.argv[1])
-    elif len(sys.argv) > 2 and os.path.isdir(sys.argv[1]):
+    elif len(sys.argv) > 2:
         # spider selected feeds 
         config.load(sys.argv[1])
         for feed in sys.argv[2:]: