diff --git a/Makefile b/Makefile
index c714115065..043dda96c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TRAC_ROOT=/var/lib/trac/libprs500/htdocs/apidocs
+APIDOCS=/var/www/libprs500.kovidgoyal.net//htdocs/apidocs
 
 all: doc sdist egg
 
@@ -10,6 +10,6 @@ egg:
 
 doc:
 	epydoc --config epydoc.conf
-	cp -r docs/html ${TRAC_ROOT}/
+	cp -r docs/html ${APIDOCS}/
 	epydoc -v --config epydoc-pdf.conf
-	cp docs/pdf/api.pdf ${TRAC_ROOT}/
+	cp docs/pdf/api.pdf ${APIDOCS}/
diff --git a/epydoc.conf b/epydoc.conf
index a898d50add..812484fc02 100644
--- a/epydoc.conf
+++ b/epydoc.conf
@@ -1,7 +1,7 @@
 [epydoc] # Epydoc section marker (required by ConfigParser)
 
 # Information about the project.
-name: libprs500
+name: libprs500 - API documentation
 url: http://libprs500.kovidgoyal.net
 
 # The list of modules to document.  Modules can be named using
@@ -31,7 +31,7 @@ css: white
 #   HTML code for the project link in the navigation bar.  If left
 #   unspecified, the project link will be generated based on the
 #   project's name and URL.
-#link: <a href="somewhere">My Cool Project</a>
+link: <a href="http://libprs500.kovidgoyal.net">libprs500</a>
 
 # top
 #   The "top" page for the documentation.  Can be a URL, the name
diff --git a/libprs500/gui/__init__.py b/libprs500/gui/__init__.py
index 7d9e52218f..65fb6807c2 100644
--- a/libprs500/gui/__init__.py
+++ b/libprs500/gui/__init__.py
@@ -35,7 +35,7 @@ def installErrorHandler(dialog):
 
 def Warning(msg, e):
   print >> sys.stderr, msg
-  traceback.print_exc(e)
+  if e: traceback.print_exc(e)
 
 def Error(msg, e):  
   if error_dialog:
diff --git a/libprs500/gui/widgets.py b/libprs500/gui/widgets.py
index 44d961fd0d..68d19f13c5 100644
--- a/libprs500/gui/widgets.py
+++ b/libprs500/gui/widgets.py
@@ -51,7 +51,7 @@ class FileDragAndDrop(object):
       for url in candidates:
         o = urlparse(url)        
         if o.scheme and o.scheme != 'file':
-          Warning(o.scheme +  " not supported in drop events")
+          Warning(o.scheme +  " not supported in drop events", None)
           continue
         path = unquote(o.path)
         if not os.access(path, os.R_OK):