diff --git a/bin/euscan b/bin/euscan
index d0f0b25..4bbbec9 100755
--- a/bin/euscan
+++ b/bin/euscan
@@ -252,7 +252,7 @@ def main():
     if CONFIG['progress']:
         on_progress_gen = progress_bar()
         on_progress = on_progress_gen.next()
-        on_progress(maxval=len(queries) * 100, increment=0)
+        on_progress(maxval=len(queries) * 100, increment=0, label="Working...")
 
     for query in queries:
         if CONFIG["progress"]:
diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py
index 6cf4432..9264138 100644
--- a/euscanwww/djeuscan/models.py
+++ b/euscanwww/djeuscan/models.py
@@ -136,7 +136,7 @@ class Version(models.Model):
     def __unicode__(self):
         return '%s/%s-%s-%s:%s [%s]' % (
             self.package.category, self.package.name, self.version,
-            self.revision, self.slot, self.overlay
+            self.revision, self.slot, self.overlay or "<upstream>"
         )
 
     def save(self, *args, **kwargs):
@@ -169,7 +169,7 @@ class VersionLog(models.Model):
         txt += '%s/%s-%s-%s:%s [%s]' % (
             self.package.category, self.package.name, self.version,
             self.revision, self.slot,
-            self.overlay if self.overlay else '<upstream>'
+            self.overlay or '<upstream>'
         )
         return txt
 
diff --git a/euscanwww/djeuscan/processing/scan/scan_upstream.py b/euscanwww/djeuscan/processing/scan/scan_upstream.py
index e06b5d7..9c8258b 100644
--- a/euscanwww/djeuscan/processing/scan/scan_upstream.py
+++ b/euscanwww/djeuscan/processing/scan/scan_upstream.py
@@ -30,6 +30,11 @@ class ScanUpstream(object):
             scan_time = out[package]["metadata"]["scan_time"]
             ebuild = out[package]["metadata"]["ebuild"]
         except KeyError:
+            self.logger.error(
+                "Error while scanning upstream for package %s!\n%s",
+                package,
+                out_json
+            )
             return {}
 
         obj = self.store_package(cpv)
@@ -147,9 +152,9 @@ def scan_upstream(packages=None, purge_versions=False,
         packages = Package.objects.all()
 
     for pkg in packages:
-        if isinstance(pkg, Package):
+        try:
             scan_handler.scan('%s/%s' % (pkg.category, pkg.name))
-        else:
+        except AttributeError:
             scan_handler.scan(pkg)
 
     scan_handler.purge_old_versions()
diff --git a/pym/euscan/out.py b/pym/euscan/out.py
index 956013e..a784f34 100644
--- a/pym/euscan/out.py
+++ b/pym/euscan/out.py
@@ -36,7 +36,7 @@ class ProgressHandler(object):
 
 def progress_bar():
     on_progress = None
-    progress_bar = TermProgressBar()
+    progress_bar = TermProgressBar(title="euscan")
 
     progress_handler = ProgressHandler(progress_bar)
     on_progress = progress_handler.on_progress